[PATCH/RFC 08/12] gettextize: git-submodule $errmsg messages
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 13, 2010, 22:09 UTC
- Message-ID
- <1284415758-20931-9-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1284415758-20931-1-git-send-email-avarab@gmail.com>
Gettextize warning messages stored in the $errmsg variable using eval_gettext interpolation. This is explicitly tested for so we need to skip some tests with NO_GETTEXT_POISON.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- git-submodule.sh | 6 +++--- t/t7401-submodule-summary.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 065b343..d453fe9 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -643,13 +643,13 @@ cmd_summary() { total_commits= case "$missing_src,$missing_dst" in t,) - errmsg=" Warn: $name doesn't contain commit $sha1_src" + errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")" ;; ,t) - errmsg=" Warn: $name doesn't contain commit $sha1_dst" + errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")" ;; 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= diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 70b2fb1..09ef760 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -154,7 +154,7 @@ EOF rm -f sm1 && test_create_repo sm1 && head6=$(add_file sm1 foo6 foo7) -test_expect_success 'nonexistent commit' " +test_expect_success NO_GETTEXT_POISON 'nonexistent commit' " git submodule summary >actual && cat >expected <<-EOF && * sm1 $head4...$head6:
-- 1.7.3.rc1.220.gb4d42