Re: [PATCH] parseopt: do not translate empty help string

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thomas Rast <trast@xxxxxxxxxxxxxxx> writes:

> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> Thomas Rast <trast@xxxxxxxxxxxxxxx> writes:
>>
>>> The gettext .po files have a header, but it looks like the translation
>>> specification for an empty string.  This results in _("") actually
>>> returning that header.
>>
>> Thanks; this is a tricky bit to catch and makes me wonder where else
>> we have a similar breakage.
>>
>> Perhaps we would want to do this instead?  I dunno.
>>
>>  gettext.h | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git i/gettext.h w/gettext.h
>> index 57ba8bb..376297b 100644
>> --- i/gettext.h
>> +++ w/gettext.h
>> @@ -44,6 +44,8 @@ extern int use_gettext_poison(void);
>>  
>>  static inline FORMAT_PRESERVING(1) const char *_(const char *msgid)
>>  {
>> +	if (!*msgid)
>> +		return "";
>>  	return use_gettext_poison() ? "# GETTEXT POISON #" : gettext(msgid);
>>  }
>
> Oh, I forgot that we actually had a wrapper instead of the usual _.
> Yes, I think that would be the better solution to guard against this.

OK, then let's replace the patch text of your commit ;-).
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]