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

[PATCH v5 09/38] i18n: rebase: fix marked string to use eval_gettext variant

From
Vasco Almeida <vascomalmeida@sapo.pt>
Date
Jun 17, 2016, 20:20 UTC
Message-ID
<1466194887-18236-10-git-send-email-vascomalmeida@sapo.pt>
In-Reply-To
<1466194887-18236-1-git-send-email-vascomalmeida@sapo.pt>

The string message marked for translation should use eval_gettext variant instead of the gettext one, since we want to dollar-substitute $head_name in the result.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
---
 git-rebase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 44ede36..1fadc04 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -154,7 +154,7 @@ move_to_original_branch () {
 		git symbolic-ref \
 			-m "rebase finished: returning to $head_name" \
 			HEAD $head_name ||
-		die "$(gettext "Could not move back to $head_name")"
+		die "$(eval_gettext "Could not move back to \$head_name")"
 		;;
 	esac
 }
-- 
2.6.6
Previous: Vasco AlmeidaNext: Vasco Almeida
Message 10 of 41 in “i18n and test updates”
  1. 00/38 i18n and test updatesVasco Almeida, Jun 17, 2016
  2. 01/38 i18n: builtin/remote.c: fix mark for translationVasco Almeida, Jun 17, 2016
  3. 02/38 i18n: advice: mark string about detached head for translationVasco Almeida, Jun 17, 2016
  4. 03/38 i18n: advice: internationalize message for conflictsVasco Almeida, Jun 17, 2016
  5. 04/38 i18n: transport: mark strings for translationVasco Almeida, Jun 17, 2016
  6. 05/38 i18n: sequencer: mark entire sentences for translationVasco Almeida, Jun 17, 2016
  7. 06/38 i18n: sequencer: mark string for translationVasco Almeida, Jun 17, 2016
  8. 07/38 i18n: merge-octopus: mark messages for translationVasco Almeida, Jun 17, 2016
  9. 08/38 merge-octupus: use die shell function from git-sh-setup.shVasco Almeida, Jun 17, 2016
  10. 09/38 i18n: rebase: fix marked string to use eval_gettext variantVasco Almeida, Jun 17, 2016
  11. 12/38 t6030: update to use test_i18ncmpVasco Almeida, Jun 17, 2016
  12. 11/38 i18n: bisect: simplify error message for i18nVasco Almeida, Jun 17, 2016
  13. 17/38 i18n: setup: mark strings for translationVasco Almeida, Jun 17, 2016
  14. 14/38 i18n: rebase-interactive: mark strings for translationVasco Almeida, Jun 17, 2016
  15. 22/38 t5523: use test_i18ngrep for negationVasco Almeida, Jun 17, 2016
  16. 20/38 t9003: become resilient to GETTEXT_POISONVasco Almeida, Jun 17, 2016
  17. 28/38 i18n: merge: mark messages for translationVasco Almeida, Jun 17, 2016
  18. 31/38 i18n: standardise messagesVasco Almeida, Jun 17, 2016
  19. 33/38 i18n: remote: allow translations to reorder messageVasco Almeida, Jun 17, 2016
  20. 30/38 i18n: sequencer: add period to error messageVasco Almeida, Jun 17, 2016
  21. 32/38 i18n: remote: mark URL fallback text for translationVasco Almeida, Jun 17, 2016
  22. 27/38 i18n: config: unfold error messages marked for translationVasco Almeida, Jun 17, 2016
  23. 29/38 i18n: merge: change command option help to lowercaseVasco Almeida, Jun 17, 2016
  24. 23/38 i18n: bisect: mark strings for translationVasco Almeida, Jun 17, 2016
  25. 24/38 i18n: transport-helper.c: change N_() call to _()Vasco Almeida, Jun 17, 2016
  26. 26/38 i18n: notes: mark options for translationVasco Almeida, Jun 17, 2016
  27. 18/38 tests: use test_i18n* functions to suppress false positivesVasco Almeida, Jun 17, 2016
  28. 21/38 t4153: fix negated test_i18ngrep callVasco Almeida, Jun 17, 2016
  29. 25/38 i18n: notes: mark strings for translationVasco Almeida, Jun 17, 2016
  30. 19/38 tests: unpack-trees: update to use test_i18n* functionsVasco Almeida, Jun 17, 2016
  31. 15/38 i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida, Jun 17, 2016
  32. 10/38 i18n: rebase: mark placeholder for translationVasco Almeida, Jun 17, 2016
  33. 13/38 i18n: git-sh-setup.sh: mark strings for translationVasco Almeida, Jun 17, 2016
  34. 16/38 i18n: rebase-interactive: mark comments of squash for translationVasco Almeida, Jun 17, 2016
  35. Junio C HamanoJun 17, 2016
  36. Junio C HamanoJun 17, 2016
  37. 34/38 i18n: init-db: join message piecesVasco Almeida, Jun 17, 2016
  38. 36/38 i18n: submodule: escape shell variables inside eval_gettextVasco Almeida, Jun 17, 2016
  39. 37/38 i18n: unmark die messages for translationVasco Almeida, Jun 17, 2016
  40. 35/38 i18n: submodule: join strings marked for translationVasco Almeida, Jun 17, 2016
  41. 38/38 i18n: branch: mark comment when editing branch description for translationVasco Almeida, Jun 17, 2016

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.