i18n: git-submodule "[...] path is ignored" message
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:44 UTC
3a4c3ed7e8b4f54876d6e855d3644c15d5d2207d
2 files changed
+7
-4
git-submodule.sh
+6
-3
@@ -223,9 +223,12 @@ cmd_add()
223
224
if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
225
then
226
- echo >&2 "The following path is ignored by one of your .gitignore files:" &&
227
- echo >&2 $path &&
228
- echo >&2 "Use -f if you really want to add it."
226
+ (
227
+ eval_gettext "The following path is ignored by one of your .gitignore files:
228
+\$path
229
+Use -f if you really want to add it." &&
230
+ echo
231
+ ) >&2
232
exit 1
233
fi
234
t/t7400-submodule-basic.sh
+1
-1
@@ -99,7 +99,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
99
git add --force .gitignore &&
100
git commit -m"Ignore everything" &&
101
! git submodule add "$submodurl" submod >actual 2>&1 &&
102
- test_cmp expect actual
102
+ test_i18ncmp expect actual
103
)
104
'
105