kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

i18n: git-submodule $update_module say + die messages 

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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2011-05-21 18:44:02 +00:00 committed by Junio C Hamano
parent 497ee87245
commit ee653c89ff
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git-submodule.sh
View File

@ -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"

2
t/t7406-submodule-update.sh
View File

@ -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
'