i18n: git-submodule $errmsg messages
Gettextize warning messages stored in the $errmsg variable using eval_gettext interpolation. This is explicitly tested for so we need to skip a portion of a test with test_i18ncmp. 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
f62f8212e1e47f25cc8e1d3e25b99c6f8c779b17
2 files changed
+4
-4
git-submodule.sh
+3
-3
@@ -678,13 +678,13 @@ cmd_summary() {
678
total_commits=
679
case "$missing_src,$missing_dst" in
680
t,)
681
- errmsg=" Warn: $name doesn't contain commit $sha1_src"
681
+ errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
682
;;
683
,t)
684
- errmsg=" Warn: $name doesn't contain commit $sha1_dst"
684
+ errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
685
;;
686
t,t)
687
- errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
687
+ errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
688
;;
689
*)
690
errmsg=
t/t7401-submodule-summary.sh
+1
-1
@@ -162,7 +162,7 @@ test_expect_success 'nonexistent commit' "
162
Warn: sm1 doesn't contain commit $head4_full
163
164
EOF
165
- test_cmp actual expected
165
+ test_i18ncmp actual expected
166
"
167
168
commit_file