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

[PATCH 27/51] i18n: git-submodule $errmsg messages

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Apr 3, 2011, 16:45 UTC
Message-ID
<1301849175-1697-28-git-send-email-avarab@gmail.com>
In-Reply-To
<1301849175-1697-1-git-send-email-avarab@gmail.com>

Gettextize warning messages stored in the $errmsg variable using eval_gettext interpolation. This is explicitly tested for so we need to skip some tests with C_LOCALE_OUTPUT.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-submodule.sh             |    6 +++---
 t/t7401-submodule-summary.sh |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 5fe29a2..b6c9a5b 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -646,13 +646,13 @@ cmd_summary() {
 		total_commits=
 		case "$missing_src,$missing_dst" in
 		t,)
-			errmsg="  Warn: $name doesn't contain commit $sha1_src"
+			errmsg="$(eval_gettext "  Warn: \$name doesn't contain commit \$sha1_src")"
 			;;
 		,t)
-			errmsg="  Warn: $name doesn't contain commit $sha1_dst"
+			errmsg="$(eval_gettext "  Warn: \$name doesn't contain commit \$sha1_dst")"
 			;;
 		t,t)
-			errmsg="  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
+			errmsg="$(eval_gettext "  Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
 			;;
 		*)
 			errmsg=
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index efd220b..1b703fb 100755
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -155,7 +155,7 @@ EOF
 rm -f sm1 &&
 test_create_repo sm1 &&
 head6=$(add_file sm1 foo6 foo7)
-test_expect_success 'nonexistent commit' "
+test_expect_success C_LOCALE_OUTPUT 'nonexistent commit' "
     git submodule summary >actual &&
     cat >expected <<-EOF &&
 * sm1 $head4...$head6:
-- 
1.7.4.1
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 33 of 59 in “i18n: Shell script translations”
  1. 00/51 i18n: Shell script translationsÆvar Arnfjörð Bjarmason, Apr 3, 2011
  2. 01/51 i18n: git-am add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  3. 02/51 i18n: git-am one-line gettext $msg; echoÆvar Arnfjörð Bjarmason, Apr 3, 2011
  4. 03/51 i18n: git-am multi-line getttext $msg; echoÆvar Arnfjörð Bjarmason, Apr 3, 2011
  5. 04/51 i18n: git-am eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  6. 05/51 i18n: git-am echo + gettext messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  7. 06/51 i18n: git-am die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  8. 07/51 i18n: git-am cannot_fallback messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  9. 08/51 i18n: git-am clean_abort messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  10. 09/51 i18n: git-am "Apply?" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  11. 10/51 i18n: git-am core say messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  12. Jakub NarebskiApr 3, 2011
  13. Ævar Arnfjörð BjarmasonApr 3, 2011
  14. 11/51 i18n: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason, Apr 3, 2011
  15. 12/51 i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  16. 13/51 i18n: git-pull die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  17. Ævar Arnfjörð BjarmasonApr 3, 2011
  18. 14/51 i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  19. 15/51 i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  20. 16/51 i18n: git-pull split up "no candidate" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  21. 17/51 i18n: git-pull "You asked to pull" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  22. 18/51 i18n: git-pull "[...] not currently on a branch" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  23. 19/51 i18n: git-pull "rebase against" / "merge with" messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  24. Martin von ZweigbergkApr 3, 2011
  25. Ævar Arnfjörð BjarmasonApr 4, 2011
  26. 20/51 i18n: git-submodule add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  27. 21/51 i18n: git-submodule echo + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  28. 22/51 i18n: git-submodule say + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  29. 23/51 i18n: git-submodule die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  30. 24/51 i18n: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  31. 25/51 i18n: git-submodule "cached cannot be used" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  32. 26/51 i18n: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  33. 27/51 i18n: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  34. 28/51 i18n: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  35. 29/51 i18n: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  36. 30/51 i18n: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  37. 31/51 i18n: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  38. 32/51 i18n: git-stash add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  39. 33/51 i18n: git-stash echo + gettext messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  40. 34/51 i18n: git-stash say + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  41. 35/51 i18n: git-stash die + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  42. 36/51 i18n: git-stash die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  43. 37/51 i18n: git-stash die + eval_gettext $* messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  44. 38/51 i18n: git-stash die + eval_gettext $1 messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  45. 39/51 i18n: git-stash "unknown option" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  46. 40/51 i18n: git-stash drop_stash say/die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  47. 41/51 i18n: git-bisect add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  48. 42/51 i18n: git-bisect gettext + echo messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  49. 43/51 i18n: git-bisect echo + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  50. 44/51 i18n: git-bisect echo + eval_gettext messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  51. 45/51 i18n: git-bisect die + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  52. 46/51 i18n: git-bisect die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  53. 47/51 i18n: git-bisect bisect_run + $@ messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  54. 48/51 i18n: git-bisect bisect_reset + $1 messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  55. 49/51 i18n: git-bisect bisect_replay + $1 messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  56. 50/51 i18n: git-bisect [Y/n] messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  57. 51/51 i18n: git-bisect bisect_next_check "You need to" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  58. Junio C HamanoApr 3, 2011
  59. Ævar Arnfjörð BjarmasonApr 10, 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.