diff options
Diffstat (limited to 'bin/gettext-merge')
| -rwxr-xr-x | bin/gettext-merge | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/bin/gettext-merge b/bin/gettext-merge index 84aa4fdb7..b84708ece 100755 --- a/bin/gettext-merge +++ b/bin/gettext-merge @@ -6,22 +6,7 @@ # Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ -# Yuck -if [ -e ../../locale ] -then - cd ../../ -else if [ -e ../locale ] -then - cd ../ -else if [ -e locale ] -then - cd . -else - echo "Please run with current directory fixmystreet" - exit 1 -fi -fi -fi +cd "$(dirname $(readlink -f $BASH_SOURCE))/.." for X in locale/*.UTF-8 do @@ -31,12 +16,12 @@ do echo $X if [ -e EmptyHomes.po ] then - msgmerge -o New.po EmptyHomes.po ../../FixMyStreet-EmptyHomes.po + msgmerge --no-wrap -o New.po EmptyHomes.po ../../FixMyStreet-EmptyHomes.po mv New.po EmptyHomes.po fi if [ -e FixMyStreet.po ] then - msgmerge -o New.po FixMyStreet.po ../../FixMyStreet.po + msgmerge --no-wrap -o New.po FixMyStreet.po ../../FixMyStreet.po mv New.po FixMyStreet.po fi cd - >/dev/null |