Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process

[Duy Nguyen <pclouds@gmail.com>]

On Mon, Mar 10, 2014 at 7:51 PM, Sandy Carter
<sandy.carter@savoirfairelinux.com> wrote:
> Is there any update on this patch?

The patch looks good. Maybe Junio missed it.

>
> Le 2014-03-03 09:55, Sandy Carter a écrit :
>
>> Separate message from command examples to avoid translation issues
>> such as a dash being omitted in a translation.
>>
>> Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
>> ---
>>   builtin/branch.c | 10 ++++++----
>>   1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/builtin/branch.c b/builtin/branch.c
>> index b4d7716..b304da8 100644
>> --- a/builtin/branch.c
>> +++ b/builtin/branch.c
>> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const
>> char *prefix)
>>                  */
>>                 if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
>>                     !branch_existed && remote_tracking) {
>> -                       fprintf(stderr, _("\nIf you wanted to make '%s'
>> track '%s', do this:\n\n"), head, branch->name);
>> -                       fprintf(stderr, _("    git branch -d %s\n"),
>> branch->name);
>> -                       fprintf(stderr, _("    git branch
>> --set-upstream-to %s\n"), branch->name);
>> +                       fprintf(stderr, "\n");
>> +                       fprintf(stderr, _("If you wanted to make '%s'
>> track '%s', do this:"), head, branch->name);
>> +                       fprintf(stderr, "\n\n");
>> +                       fprintf(stderr, "    git branch -d %s\n",
>> branch->name);
>> +                       fprintf(stderr, "    git branch --set-upstream-to
>> %s\n", branch->name);
>> +                       fprintf(stderr, "\n");
>>                 }
>> -
>>         } else
>>                 usage_with_options(builtin_branch_usage, options);
>>
>>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Duy