Gettextize the "The following path is ignored" message. This is explicitly tested for so we need to skip some tests with NO_GETTEXT_POISON. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- git-submodule.sh | 6 +++--- t/t7400-submodule-basic.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 6ec6aa5..cd37bf7 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -208,9 +208,9 @@ 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." + echo >&2 "$(eval_gettext "The following path is ignored by one of your .gitignore files: +\$path +Use -f if you really want to add it.")" exit 1 fi diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 9bda970..0531dd1 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -86,7 +86,7 @@ test_expect_success 'submodule add' ' test_cmp empty untracked ' -test_expect_success 'submodule add to .gitignored path fails' ' +test_expect_success NO_GETTEXT_POISON 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && cat <<-\EOF >expect && -- 1.7.3.rc1.220.gb4d42 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html