git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH/RFC 10/12] gettextize: git-submodule "[...] path is ignored" message

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Sep 13, 2010, 22:09 UTC
Message-ID
<1284415758-20931-11-git-send-email-avarab@gmail.com>
In-Reply-To
<1284415758-20931-1-git-send-email-avarab@gmail.com>

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@gmail.com>
---
 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
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 11 of 13 in “gettextize: git-submodule”
  1. 00/12 gettextize: git-submoduleÆvar Arnfjörð Bjarmason, Sep 13, 2010
  2. 01/12 gettextize: git-submodule add git-sh-i18nÆvar Arnfjörð Bjarmason, Sep 13, 2010
  3. 02/12 gettextize: git-submodule echo + eval_gettext messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010
  4. 03/12 gettextize: git-submodule say + eval_gettext messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010
  5. 04/12 gettextize: git-submodule die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010
  6. 05/12 gettextize: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010
  7. 06/12 gettextize: git-submodule "cached cannot be used" messageÆvar Arnfjörð Bjarmason, Sep 13, 2010
  8. 07/12 gettextize: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010
  9. 08/12 gettextize: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010
  10. 09/12 gettextize: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason, Sep 13, 2010
  11. 10/12 gettextize: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason, Sep 13, 2010
  12. 11/12 gettextize: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason, Sep 13, 2010
  13. 12/12 gettextize: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason, Sep 13, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.