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

i18n: git-submodule $errmsg messages

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2011-05-21 18:44:05 +00:00
committed by Junio C Hamano
parent 165119e9e6
commit f62f8212e1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-submodule.sh
View File

@ -678,13 +678,13 @@ cmd_summary() {
total_commits= total_commits=
case "$missing_src,$missing_dst" in case "$missing_src,$missing_dst" in
t,) t,)
errmsg=" Warn: $name doesn't contain commit $sha1_src" errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
;; ;;
,t) ,t)
errmsg=" Warn: $name doesn't contain commit $sha1_dst" errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
;; ;;
t,t) t,t)
errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst" errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
;; ;;
*) *)
errmsg= errmsg=

2
t/t7401-submodule-summary.sh
View File

@ -162,7 +162,7 @@ test_expect_success 'nonexistent commit' "
Warn: sm1 doesn't contain commit $head4_full Warn: sm1 doesn't contain commit $head4_full
EOF EOF
test_cmp actual expected test_i18ncmp actual expected
" "
commit_file commit_file