mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-submodule $update_module say + die messages

Browse Source 
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>
This commit is contained in:
Æ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
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 case "$update_module" in
rebase) rebase)
command="git rebase" command="git rebase"
action="rebase" die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
msg="rebased onto" say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
;; ;;
merge) merge)
command="git merge" command="git merge"
action="merge" die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")"
msg="merged in" say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
;; ;;
*) *)
command="git checkout $subforce -q" command="git checkout $subforce -q"
action="checkout" die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")"
msg="checked out" say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
;; ;;
esac esac
(clear_local_git_env; cd "$path" && $command "$sha1") || (clear_local_git_env; cd "$path" && $command "$sha1") || die $die_msg
die "Unable to $action '$sha1' in submodule path '$path'" say $say_msg
say "Submodule path '$path': $msg '$sha1'"
fi fi
if test -n "$recursive" 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 && (cd super &&
git submodule update > ../actual 2> ../actual.err git submodule update > ../actual 2> ../actual.err
) && ) &&
test_cmp expected actual && test_i18ncmp expected actual &&
! test -s actual.err ! test -s actual.err
' '