From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Apr 2016 18:01:27 GMT
Subject: Re: [PATCH v2 4/7] i18n: builtin/pull.c: mark strings for translation
Message-ID: <xmqqinzptkaw.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1460234324-13506-4-git-send-email-vascomalmeida@sapo.pt>

Vasco Almeida <vascomalmeida@sapo.pt> writes:

> Some translations might also translate "<remote>" and "<branch>".

This offers an interesting observation that I didn't think of while
reviewing the first round of this series.

Do translations want to translate "remote" and "branch" without the
"<bra" and "ket>"?  Or is it better to allow translations to adjust
the "quote around a placeholder" in a locale dependent way?

> @@ -458,13 +458,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
>  			fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
>  		fprintf_ln(stderr, _("See git-pull(1) for details."));
>  		fprintf(stderr, "\n");
> -		fprintf_ln(stderr, "    git pull <remote> <branch>");
> +		fprintf_ln(stderr, "    git pull <%s> <%s>", _("remote"), _("branch"));

I know this hunk follows I suggested, i.e. "quotes around a
placeholder is universal and locale independent".  However, ...

>  		fprintf(stderr, "\n");
>  	} else if (!curr_branch->merge_nr) {
>  		const char *remote_name = NULL;
>  
>  		if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
> -			remote_name = "<remote>";
> +			remote_name = _("<remote>");
>  
... this does not.  It allows to translate the "quote around a
placeholder".  And where this phony "remote_name" string is used,
there is also this reference to <branch>:

    fprintf_ln(stderr, _("If you wish to set tracking information for ..."
                    "\n"
                    "    git branch --set-upstream-to=%s/<branch> %s\n"),
                    remote_name, curr_branch->name);

which also does.

Perhaps the first hunk at around ll.458 would want to do

> +	fprintf_ln(stderr, "    git pull %s %s", _("<remote>"), _("<branch>"));

to be consistent and more flexible for the translator's needs?  The
quoting convention may be locale dependent after all.