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

[PATCH v2 28/48] i18n: git-submodule "blob" and "submodule" messages

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

Gettextize the words "blob" and "submodule", which will be interpolated in a message emitted by git-submodule. 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>
---
 git-submodule.sh             |    6 ++++--
 t/t7401-submodule-summary.sh |    8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 654a8cb..c1d3a5e 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -712,11 +712,13 @@ cmd_summary() {
 		sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
 		if test $status = T
 		then
+			blob="$(gettext "blob")"
+			submodule="$(gettext "submodule")"
 			if test $mod_dst = 160000
 			then
-				echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
+				echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
 			else
-				echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
+				echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
 			fi
 		else
 			echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index cfa6632..30b429e 100755
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -128,7 +128,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' "
   < Add foo5
 
 EOF
-	test_cmp actual expected
+	test_i18ncmp actual expected
 "
 
 test_expect_success 'typechanged submodule(submodule->blob), --files' "
@@ -138,7 +138,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --files' "
   > Add foo5
 
 EOF
-    test_cmp actual expected
+    test_i18ncmp actual expected
 "
 
 rm -rf sm1 &&
@@ -149,7 +149,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' "
 * sm1 $head4(submodule)->$head5(blob):
 
 EOF
-    test_cmp actual expected
+    test_i18ncmp actual expected
 "
 
 rm -f sm1 &&
@@ -173,7 +173,7 @@ test_expect_success 'typechanged submodule(blob->submodule)' "
   > Add foo7
 
 EOF
-    test_cmp expected actual
+    test_i18ncmp expected actual
 "
 
 commit_file sm1 &&

-- 
1.7.5.1
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 29 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.