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>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:44 UTC
ee653c89ff77eaadd2162870267ad812fdc34af5
2 files changed
+9
-10
git-submodule.sh
+8
-9
@@ -511,24 +511,23 @@ cmd_update()
511
case "$update_module" in
512
rebase)
513
command="git rebase"
514
- action="rebase"
515
- msg="rebased onto"
514
+ die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
515
+ say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
516
;;
517
merge)
518
command="git merge"
519
- action="merge"
520
- msg="merged in"
519
+ die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")"
520
+ say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
521
;;
522
*)
523
command="git checkout $subforce -q"
524
- action="checkout"
525
- msg="checked out"
524
+ die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")"
525
+ say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
526
;;
527
esac
528
529
- (clear_local_git_env; cd "$path" && $command "$sha1") ||
530
- die "Unable to $action '$sha1' in submodule path '$path'"
531
- say "Submodule path '$path': $msg '$sha1'"
529
+ (clear_local_git_env; cd "$path" && $command "$sha1") || die $die_msg
530
+ say $say_msg
531
fi
532
533
if test -n "$recursive"
t/t7406-submodule-update.sh
+1
-1
@@ -90,7 +90,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
90
(cd super &&
91
git submodule update > ../actual 2> ../actual.err
92
) &&
93
- test_cmp expected actual &&
93
+ test_i18ncmp expected actual &&
94
! test -s actual.err
95
'
96