From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Mar 2016 15:57:09 GMT
Subject: Re: [PATCH] wt-status: allow "ahead " to be picked up by l10n
Message-ID: <xmqqk2l5aw8a.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <3b88641beff6b34ae8b86bf353e6fbb8f9e636f1.1457969307.git.git@drmicha.warpmail.net>

Michael J Gruber <git@drmicha.warpmail.net> writes:

> The extra pair of parentheses keeps the l10n engine from picking up the
> string. Remove them so that "ahead " ends up in git.pot.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---

Thanks, will apply.

>  wt-status.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index ab4f80d..ef74864 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1677,10 +1677,10 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
>  		color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
>  		color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
>  	} else if (!num_theirs) {
> -		color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
> +		color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
>  		color_fprintf(s->fp, branch_color_local, "%d", num_ours);
>  	} else {
> -		color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
> +		color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
>  		color_fprintf(s->fp, branch_color_local, "%d", num_ours);
>  		color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
>  		color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);