[PATCH 31/51] i18n: git-submodule "blob" and "submodule" messages
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Apr 3, 2011, 16:45 UTC
- Message-ID
- <1301849175-1697-32-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1301849175-1697-1-git-send-email-avarab@gmail.com>
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 some tests with C_LOCALE_OUTPUT.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- git-submodule.sh | 6 ++++-- t/t7401-submodule-summary.sh | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index bc24b2f..aced079 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -677,11 +677,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:" diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 1b703fb..548473b 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -121,7 +121,7 @@ git add sm1 && rm -f sm1 && mv sm1-bak sm1 -test_expect_success 'typechanged submodule(submodule->blob), --cached' " +test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(submodule->blob), --cached' " git submodule summary --cached >actual && cat >expected <<-EOF && * sm1 $head4(submodule)->$head5(blob) (3): @@ -131,7 +131,7 @@ EOF test_cmp actual expected " -test_expect_success 'typechanged submodule(submodule->blob), --files' " +test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(submodule->blob), --files' " git submodule summary --files >actual && cat >expected <<-EOF && * sm1 $head5(blob)->$head4(submodule) (3): @@ -143,7 +143,7 @@ EOF rm -rf sm1 && git checkout-index sm1 -test_expect_success 'typechanged submodule(submodule->blob)' " +test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(submodule->blob)' " git submodule summary >actual && cat >expected <<-EOF && * sm1 $head4(submodule)->$head5(blob): @@ -166,7 +166,7 @@ EOF " commit_file -test_expect_success 'typechanged submodule(blob->submodule)' " +test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(blob->submodule)' " git submodule summary >actual && cat >expected <<-EOF && * sm1 $head5(blob)->$head6(submodule) (2):
-- 1.7.4.1