diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:44:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:16 -0700 |
| commit | 490b6d5749c432370c4f8a5ed8d854cbf1116e20 (patch) | |
| tree | 1849ef78f3b3b6403f21ea4d30da455085bdb1b6 | |
| parent | f62f8212e1e47f25cc8e1d3e25b99c6f8c779b17 (diff) | |
| download | git-490b6d5749c432370c4f8a5ed8d854cbf1116e20.tar.gz | |
i18n: git-submodule "Entering [...]" message
Gettextize the "Entering [...]" message. 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>
| -rwxr-xr-x | git-submodule.sh | 2 | ||||
| -rwxr-xr-x | t/t7407-submodule-foreach.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 5de34e40c0..f7d7f51c37 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -306,7 +306,7 @@ cmd_foreach() do if test -e "$path"/.git then - say "Entering '$prefix$path'" + say "$(eval_gettext "Entering '\$prefix\$path'")" name=$(module_name "$path") ( prefix="$prefix$path/" diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index e5be13c271..ae3bd18a5e 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -77,7 +77,7 @@ test_expect_success 'test basic "submodule foreach" usage' ' git config foo.bar zar && git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar" ) && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success 'setup nested submodules' ' @@ -158,7 +158,7 @@ test_expect_success 'test messages from "foreach --recursive"' ' cd clone2 && git submodule foreach --recursive "true" > ../actual ) && - test_cmp expect actual + test_i18ncmp expect actual ' cat > expect <<EOF |