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

[Vasco Almeida <vascomalmeida@sapo.pt>]

A Terça, 7 de Junho de 2016 12:55:37 Vasco Almeida escreveu:
> 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.