From: Ævar Arnfjörð Bjarmason Date: Sun, 08 May 2011 12:20:53 GMT Subject: [PATCH 21/48] i18n: git-submodule $update_module say + die messages Message-ID: <1304857280-14773-22-git-send-email-avarab@gmail.com> In-Reply-To: <1304857280-14773-1-git-send-email-avarab@gmail.com> Gettextize $update_module say and die messages. These messages needed to be split up to make them translatable. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-submodule.sh | 17 ++++++++--------- t/t7406-submodule-update.sh | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 1c3d4ce..ecd0b68 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -511,24 +511,23 @@ cmd_update() case "$update_module" in rebase) command="git rebase" - action="rebase" - msg="rebased onto" + die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")" + say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")" ;; merge) command="git merge" - action="merge" - msg="merged in" + die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")" + say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")" ;; *) command="git checkout $subforce -q" - action="checkout" - msg="checked out" + die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")" + say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")" ;; esac - (clear_local_git_env; cd "$path" && $command "$sha1") || - die "Unable to $action '$sha1' in submodule path '$path'" - say "Submodule path '$path': $msg '$sha1'" + (clear_local_git_env; cd "$path" && $command "$sha1") || die $die_msg + say $say_msg fi if test -n "$recursive" diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 4f16fcc..60e33be 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -90,7 +90,7 @@ test_expect_success 'submodule update does not fetch already present commits' ' (cd super && git submodule update > ../actual 2> ../actual.err ) && - test_cmp expected actual && + test_i18ncmp expected actual && ! test -s actual.err ' -- 1.7.4.4