widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

Review: Needs Fixing

Inline comments as I am on a slow internet connection.

Diff comments:

> === added file 'utils/merge_and_push_translations.sh'
> --- utils/merge_and_push_translations.sh	1970-01-01 00:00:00 +0000
> +++ utils/merge_and_push_translations.sh	2014-11-25 12:53:25 +0000
> @@ -0,0 +1,22 @@
> +## This script will fix translations in the translation branch
> +## and then push the fix to the translations branch on Launchpad.
> +## Afterwards, the translations branch will be merged into trunk,
> +## the catalogs be updated and the result pushed to trunk on Launchpad.
> +

set -ex or something along these lines. Also make sure that you are in the widelands root directory (check for src/ worlds/ tribe/ directories for example). Or check for utils/buildcat.py since we rely on this being there later on.

> +# Fix LF in translation branch.
> +cd ../translations && bzr pull

if [ ! -d "../translations ]; then echo "Please branch lp:~widelands-dev/widelands/translations into ../translations"; done

> +utils/remove_lf_in_translations.py
> +bzr add po

What is this doing? You are never adding new files here, are you?

> +bzr commit -m "Fixed LF in translations." || true
> +bzr push lp:~widelands-dev/widelands/translations
> +
> +# Merge translations.
> +cd ../trunk && bzr pull

Use pushd/popd to go back to the trunk directory. No need to add another assumption.

> +bzr merge lp:~widelands-dev/widelands/translations
> +bzr commit -m "Merged translations."
> +
> +# Update catalogues.
> +utils/buildcat.py
> +bzr add po
> +bzr commit -m "Updated catalogues."
> +bzr push lp:widelands
> 


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1219914/+merge/242772
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1219914.