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

Re: [PATCH v4 34/38] i18n: init-db: join message pieces

From
Vasco Almeida <vascomalmeida@sapo.pt>
Date
Jun 17, 2016, 17:41 UTC
Message-ID
<1562644.BnkjqA6nsN@linux-omuo>
In-Reply-To
<1465304141-9392-5-git-send-email-vascomalmeida@sapo.pt>
A Terça, 7 de Junho de 2016 12:55:37 Vasco Almeida escreveu:
Show 37 quoted lines
> Join message displayed during repository initialization in one entire
> sentence. That would improve translations since it's easier translate an
> entire sentence than translating each piece.
> 
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> ---
>  builtin/init-db.c | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/builtin/init-db.c b/builtin/init-db.c
> index b2d8d40..3a45f0b 100644
> --- a/builtin/init-db.c
> +++ b/builtin/init-db.c
> @@ -397,13 +397,16 @@ int init_db(const char *template_dir, unsigned int
> flags) if (!(flags & INIT_DB_QUIET)) {
>  		int len = strlen(git_dir);
> 
> -		/* TRANSLATORS: The first '%s' is either "Reinitialized
> -		   existing" or "Initialized empty", the second " shared" or
> -		   "", and the last '%s%s' is the verbatim directory name. */
> -		printf(_("%s%s Git repository in %s%s\n"),
> -		       reinit ? _("Reinitialized existing") : _("Initialized empty"),
> -		       get_shared_repository() ? _(" shared") : "",
> -		       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
> +		if (reinit)
> +			printf(get_shared_repository()
> +			       ? _("Reinitialized existing shared Git repository in %s%s\n")
> +			       : _("Reinitialized existing Git repository in %s%s\n"),
> +			       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
> +		else
> +			printf(get_shared_repository()
> +			       ? _("Initialized empty shared Git repository in %s%s\n")
> +			       : _("Initialized empty Git repository in %s%s\n"),
> +			       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
>  	}
> 
>  	return 0;

This patch breaks test t0204-gettext-reencode-sanity.sh because those strings are used in Icelandic translation for checking gettext. Since the message id has changed, git outputs in English instead of Icelandic.

I must have forgot to check normal build (without GETTEXT_POISON enabled). I'm going to send a re-roll updating the Icelandic translation best I can or Ævar Arnfjörð Bjarmason could do it for me.

Previous: Vasco AlmeidaNext: Vasco Almeida
Message 37 of 43 in “i18n and test updates”
  1. 00/38 i18n and test updatesVasco Almeida, Jun 7, 2016
  2. 01/38 i18n: builtin/remote.c: fix mark for translationVasco Almeida, Jun 7, 2016
  3. 02/38 i18n: advice: mark string about detached head for translationVasco Almeida, Jun 7, 2016
  4. 03/38 i18n: advice: internationalize message for conflictsVasco Almeida, Jun 7, 2016
  5. 04/38 i18n: transport: mark strings for translationVasco Almeida, Jun 7, 2016
  6. 05/38 i18n: sequencer: mark entire sentences for translationVasco Almeida, Jun 7, 2016
  7. 06/38 i18n: sequencer: mark string for translationVasco Almeida, Jun 7, 2016
  8. 07/38 i18n: merge-octopus: mark messages for translationVasco Almeida, Jun 7, 2016
  9. 08/38 merge-octupus: use die shell function from git-sh-setup.shVasco Almeida, Jun 7, 2016
  10. 09/38 i18n: rebase: fix marked string to use eval_gettext variantVasco Almeida, Jun 7, 2016
  11. 10/38 i18n: rebase: mark placeholder for translationVasco Almeida, Jun 7, 2016
  12. 11/38 i18n: bisect: simplify error message for i18nVasco Almeida, Jun 7, 2016
  13. 12/38 t6030: update to use test_i18ncmpVasco Almeida, Jun 7, 2016
  14. 13/38 i18n: git-sh-setup.sh: mark strings for translationVasco Almeida, Jun 7, 2016
  15. 14/38 i18n: rebase-interactive: mark strings for translationVasco Almeida, Jun 7, 2016
  16. 15/38 i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida, Jun 7, 2016
  17. 16/38 i18n: rebase-interactive: mark comments of squash for translationVasco Almeida, Jun 7, 2016
  18. 17/38 i18n: setup: mark strings for translationVasco Almeida, Jun 7, 2016
  19. 18/38 tests: use test_i18n* functions to suppress false positivesVasco Almeida, Jun 7, 2016
  20. 19/38 tests: unpack-trees: update to use test_i18n* functionsVasco Almeida, Jun 7, 2016
  21. 20/38 t9003: become resilient to GETTEXT_POISONVasco Almeida, Jun 7, 2016
  22. 21/38 t4153: fix negated test_i18ngrep callVasco Almeida, Jun 7, 2016
  23. 22/38 t5523: use test_i18ngrep for negationVasco Almeida, Jun 7, 2016
  24. 23/38 i18n: bisect: mark strings for translationVasco Almeida, Jun 7, 2016
  25. 24/38 i18n: transport-helper.c: change N_() call to _()Vasco Almeida, Jun 7, 2016
  26. 25/38 i18n: notes: mark strings for translationVasco Almeida, Jun 7, 2016
  27. 26/38 i18n: notes: mark options for translationVasco Almeida, Jun 7, 2016
  28. 27/38 i18n: config: unfold error messages marked for translationVasco Almeida, Jun 7, 2016
  29. Junio C HamanoJun 7, 2016
  30. 28/38 i18n: merge: mark messages for translationVasco Almeida, Jun 7, 2016
  31. 29/38 i18n: merge: change command option help to lowercaseVasco Almeida, Jun 7, 2016
  32. 30/38 i18n: sequencer: add period to error messageVasco Almeida, Jun 7, 2016
  33. 31/38 i18n: standardise messagesVasco Almeida, Jun 7, 2016
  34. 32/38 i18n: remote: mark URL fallback text for translationVasco Almeida, Jun 7, 2016
  35. 33/38 i18n: remote: allow translations to reorder messageVasco Almeida, Jun 7, 2016
  36. 34/38 i18n: init-db: join message piecesVasco Almeida, Jun 7, 2016
  37. Vasco AlmeidaJun 17, 2016
  38. 35/38 i18n: submodule: join strings marked for translationVasco Almeida, Jun 7, 2016
  39. 36/38 i18n: submodule: escape shell variables inside eval_gettextVasco Almeida, Jun 7, 2016
  40. 37/38 i18n: unmark die messages for translationVasco Almeida, Jun 7, 2016
  41. Junio C HamanoJun 7, 2016
  42. Pranit BauvaJun 8, 2016
  43. 38/38 i18n: branch: mark comment when editing branch description for translationVasco Almeida, Jun 7, 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.