From: Eric Sunshine <sunshine@sunshineco.com>
Date: Wed, 18 May 2016 19:24:57 GMT
Subject: Re: [PATCH 03/21] i18n: advice: internationalize message for conflicts
Message-ID: <CAPig+cTgQmJG5a8dNjkYcNPG_vEHycyi19sHkO_yO-EfFQzy5A@mail.gmail.com>
In-Reply-To: <1463585274-9027-4-git-send-email-vascomalmeida@sapo.pt>

On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida <vascomalmeida@sapo.pt> wrote:
> Mark message for translation telling the user she has conflicts to
> resolve. Expose each particular use case, in order to enable translating
> entire sentences which would facilitate translating into other
> languages.
>
> Change "Pull" to lowercase to match other messages.
>
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> ---
> diff --git a/advice.c b/advice.c
> @@ -79,7 +79,20 @@ int git_default_advice_config(const char *var, const char *value)
>  int error_resolve_conflict(const char *me)
>  {
> -       error("%s is not possible because you have unmerged files.", me);
> +       if (!strcmp(me, "cherry-pick"))
> +               error(_("cherry-pick is not possible because you have unmerged files."));
> +       else if (!strcmp(me, "commit"))
> +               error(_("commit is not possible because you have unmerged files."));
> +       else if (!strcmp(me, "merge"))
> +               error(_("merge is not possible because you have unmerged files."));
> +       else if (!strcmp(me, "pull"))
> +               error(_("pull is not possible because you have unmerged files."));
> +       else if (!strcmp(me, "revert"))
> +               error(_("revert is not possible because you have unmerged files."));
> +       else
> +               error(_("%s is not possible because you have unmerged files."),
> +                       me);

Despite the commit message, I still don't understand this change. 'me'
is a literal git command which shouldn't be translated, so how is this
helping?