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

[PATCH v2 11/48] i18n: git-am core say messages

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
May 21, 2011, 18:43 UTC
Message-ID
<1306003469-22939-12-git-send-email-avarab@gmail.com>
In-Reply-To
<1306003469-22939-1-git-send-email-avarab@gmail.com>

Make the core git-am messages that use say() translatable. These are visible on almost every git am invocation.

There are tests that depend on the "Applying" output that need to be changed to use the test_i18* functions along with this translation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-am.sh           |    6 +++---
 t/t4150-am.sh       |    2 +-
 t/t4151-am-abort.sh |    5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index aa52b51..99032ca 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -742,7 +742,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
 		stop_here $this
 	fi
 
-	say "Applying: $FIRSTLINE"
+	say "$(eval_gettext "Applying: \$FIRSTLINE")"
 
 	case "$resolved" in
 	'')
@@ -787,7 +787,7 @@ did you forget to use 'git add'?"; echo
 		    # Applying the patch to an earlier tree and merging the
 		    # result may have produced the same tree as ours.
 		    git diff-index --quiet --cached HEAD -- && {
-			say No changes -- Patch already applied.
+			say "$(gettext "No changes -- Patch already applied.")"
 			go_next
 			continue
 		    }
@@ -813,7 +813,7 @@ did you forget to use 'git add'?"; echo
 			GIT_AUTHOR_DATE=
 		fi
 		parent=$(git rev-parse --verify -q HEAD) ||
-		say >&2 "applying to an empty history"
+		say >&2 "$(gettext "applying to an empty history")"
 
 		if test -n "$committer_date_is_author_date"
 		then
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 850fc96..151404e 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -465,7 +465,7 @@ test_expect_success 'am newline in subject' '
 	test_tick &&
 	sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
 	git am <patchnl >output.out 2>&1 &&
-	grep "^Applying: second \\\n foo$" output.out
+	test_i18ngrep "^Applying: second \\\n foo$" output.out
 '
 
 test_expect_success 'am -q is quiet' '
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index c95c4cc..1176bcc 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -45,8 +45,9 @@ do
 
 	test_expect_success "am$with3 --skip continue after failed am$with3" '
 		test_must_fail git am$with3 --skip >output &&
-		test "$(grep "^Applying" output)" = "Applying: 6" &&
-		test_cmp file-2-expect file-2 &&
+		test_i18ngrep "^Applying" output >output.applying &&
+		test_i18ngrep "^Applying: 6$" output.applying &&
+		test_i18ncmp file-2-expect file-2 &&
 		test ! -f .git/MERGE_RR
 	'
 

-- 
1.7.5.1
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 12 of 51 in “i18n: mark core shell programs for translation”
  1. 00/48 i18n: mark core shell programs for translationÆvar Arnfjörð Bjarmason, May 21, 2011
  2. 01/48 i18n: git-am add git-sh-i18nÆvar Arnfjörð Bjarmason, May 21, 2011
  3. 02/48 i18n: git-am one-line gettext $msg; echoÆvar Arnfjörð Bjarmason, May 21, 2011
  4. 03/48 i18n: git-am multi-line getttext $msg; echoÆvar Arnfjörð Bjarmason, May 21, 2011
  5. 04/48 i18n: git-am eval_gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  6. 05/48 i18n: git-am gettext + gettext to stderr messageÆvar Arnfjörð Bjarmason, May 21, 2011
  7. 06/48 i18n: git-am die messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  8. 07/48 i18n: git-am cannot_fallback messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  9. 08/48 i18n: git-am clean_abort messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  10. 09/48 i18n: git-am "Apply?" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  11. 10/48 i18n: git-am "Falling back" say messageÆvar Arnfjörð Bjarmason, May 21, 2011
  12. 11/48 i18n: git-am core say messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  13. 12/48 i18n: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason, May 21, 2011
  14. 13/48 i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason, May 21, 2011
  15. 14/48 i18n: git-pull die messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  16. 15/48 i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason, May 21, 2011
  17. 16/48 i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason, May 21, 2011
  18. 17/48 i18n: git-submodule add git-sh-i18nÆvar Arnfjörð Bjarmason, May 21, 2011
  19. 18/48 i18n: git-submodule echo + eval_gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  20. 19/48 i18n: git-submodule say + eval_gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  21. 20/48 i18n: git-submodule die + eval_gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  22. 21/48 i18n: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  23. 22/48 i18n: git-submodule "cached cannot be used" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  24. 23/48 i18n: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  25. 24/48 i18n: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  26. 25/48 i18n: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  27. 26/48 i18n: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  28. 27/48 i18n: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  29. 28/48 i18n: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  30. 29/48 i18n: git-stash add git-sh-i18nÆvar Arnfjörð Bjarmason, May 21, 2011
  31. 30/48 i18n: git-stash echo + gettext messageÆvar Arnfjörð Bjarmason, May 21, 2011
  32. 31/48 i18n: git-stash say + gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  33. 32/48 i18n: git-stash die + gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  34. 33/48 i18n: git-stash die + eval_gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  35. 34/48 i18n: git-stash die + eval_gettext $* messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  36. 35/48 i18n: git-stash die + eval_gettext $1 messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  37. 36/48 i18n: git-stash "unknown option" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  38. 37/48 i18n: git-stash drop_stash say/die messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  39. 38/48 i18n: git-bisect add git-sh-i18nÆvar Arnfjörð Bjarmason, May 21, 2011
  40. 39/48 i18n: git-bisect gettext + echo messageÆvar Arnfjörð Bjarmason, May 21, 2011
  41. 40/48 i18n: git-bisect echo + gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  42. 41/48 i18n: git-bisect echo + eval_gettext messageÆvar Arnfjörð Bjarmason, May 21, 2011
  43. 42/48 i18n: git-bisect die + gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  44. 43/48 i18n: git-bisect die + eval_gettext messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  45. 44/48 i18n: git-bisect bisect_run + $@ messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  46. 45/48 i18n: git-bisect bisect_reset + $1 messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  47. 46/48 i18n: git-bisect bisect_replay + $1 messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  48. 47/48 i18n: git-bisect [Y/n] messagesÆvar Arnfjörð Bjarmason, May 21, 2011
  49. 48/48 i18n: git-bisect bisect_next_check "You need to" messageÆvar Arnfjörð Bjarmason, May 21, 2011
  50. Junio C HamanoMay 21, 2011
  51. Ævar Arnfjörð BjarmasonMay 22, 2011

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.