Browse Source

i18n: git-submodule "blob" and "submodule" messages

Gettextize the words "blob" and "submodule", which will be
interpolated in a message emitted by git-submodule. 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>
maint
Ævar Arnfjörð Bjarmason 14 years ago committed by Junio C Hamano
parent
commit
b3e7344964
  1. 6
      git-submodule.sh
  2. 8
      t/t7401-submodule-summary.sh

6
git-submodule.sh

@ -712,11 +712,13 @@ cmd_summary() { @@ -712,11 +712,13 @@ cmd_summary() {
sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
if test $status = T
then
blob="$(gettext "blob")"
submodule="$(gettext "submodule")"
if test $mod_dst = 160000
then
echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
else
echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
fi
else
echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"

8
t/t7401-submodule-summary.sh

@ -128,7 +128,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' " @@ -128,7 +128,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' "
< Add foo5

EOF
test_cmp actual expected
test_i18ncmp actual expected
"

test_expect_success 'typechanged submodule(submodule->blob), --files' "
@ -138,7 +138,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --files' " @@ -138,7 +138,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --files' "
> Add foo5

EOF
test_cmp actual expected
test_i18ncmp actual expected
"

rm -rf sm1 &&
@ -149,7 +149,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' " @@ -149,7 +149,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' "
* sm1 $head4(submodule)->$head5(blob):

EOF
test_cmp actual expected
test_i18ncmp actual expected
"

rm -f sm1 &&
@ -173,7 +173,7 @@ test_expect_success 'typechanged submodule(blob->submodule)' " @@ -173,7 +173,7 @@ test_expect_success 'typechanged submodule(blob->submodule)' "
> Add foo7

EOF
test_cmp expected actual
test_i18ncmp expected actual
"

commit_file sm1 &&

Loading…
Cancel
Save