Git development
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Tanay Abhra <tanayabh@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] config.c: mark error and warnings strings for translation
Date: Thu, 31 Jul 2014 14:18:32 +0200	[thread overview]
Message-ID: <vpq61idafhj.fsf@anie.imag.fr> (raw)
In-Reply-To: <53DA3269.40901@gmail.com> (Tanay Abhra's message of "Thu, 31 Jul 2014 17:41:21 +0530")

Tanay Abhra <tanayabh@gmail.com> writes:

> On 7/31/2014 5:01 PM, Matthieu Moy wrote:
>> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
>> ---
>> Noticed while reviewing Tanay's patches, but this one is independant
>> from his series, both syntactically and semantically.
>> 
>>  config.c | 20 ++++++++++----------
>>  1 file changed, 10 insertions(+), 10 deletions(-)
>> 
>> diff --git a/config.c b/config.c
>> index a191328..76eeb63 100644
>> --- a/config.c
>> +++ b/config.c
>> @@ -457,9 +457,9 @@ static int git_parse_source(config_fn_t fn, void *data)
>>  			break;
>>  	}
>>  	if (cf->die_on_error)
>> -		die("bad config file line %d in %s", cf->linenr, cf->name);
>> +		die(_("bad config file line %d in %s"), cf->linenr, cf->name);
>>  	else
>> -		return error("bad config file line %d in %s", cf->linenr, cf->name);
>> +		return error(_("bad config file line %d in %s"), cf->linenr, cf->name);
>
> Can I package your patch with mine in which I am going to change the
> error message to print the variable name also?

Yes, you can include it as PATCH 1 for example, and then build on top.

>> @@ -662,7 +662,7 @@ int git_config_pathname(const char **dest, const char *var, const char *value)
>>  		return config_error_nonbool(var);
>>  	*dest = expand_user_path(value);
>>  	if (!*dest)
>> -		die("Failed to expand user dir in: '%s'", value);
>> +		die(_("Failed to expand user dir in: '%s'"), value);
>
> nit : error messages start with a small letter. same case below for "Invalid". ;)

Indeed. Then I'm letting you continue on the patch.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

      reply	other threads:[~2014-07-31 12:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-31 11:31 [PATCH] config.c: mark error and warnings strings for translation Matthieu Moy
2014-07-31 12:11 ` Tanay Abhra
2014-07-31 12:18   ` Matthieu Moy [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpq61idafhj.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tanayabh@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox