From 3a4c3ed7e8b4f54876d6e855d3644c15d5d2207d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 21 May 2011 18:44:07 +0000 Subject: [PATCH] i18n: git-submodule "[...] path is ignored" message MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Gettextize the "The following path is ignored" 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 Signed-off-by: Junio C Hamano --- git-submodule.sh | 9 ++++++--- t/t7400-submodule-basic.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index f7d7f51c3..11c4bade1 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -223,9 +223,12 @@ cmd_add() if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1 then - echo >&2 "The following path is ignored by one of your .gitignore files:" && - echo >&2 $path && - echo >&2 "Use -f if you really want to add it." + ( + eval_gettext "The following path is ignored by one of your .gitignore files: +\$path +Use -f if you really want to add it." && + echo + ) >&2 exit 1 fi diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 874279e32..ea3b445b4 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -99,7 +99,7 @@ test_expect_success 'submodule add to .gitignored path fails' ' git add --force .gitignore && git commit -m"Ignore everything" && ! git submodule add "$submodurl" submod >actual 2>&1 && - test_cmp expect actual + test_i18ncmp expect actual ) ' -- 2.30.2