From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH] parseopt: do not translate empty help string
Date: Mon, 20 Aug 2012 22:10:33 +0200 [thread overview]
Message-ID: <87obm5jpdy.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <7vboi5jrn1.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 20 Aug 2012 12:21:54 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Thomas Rast <trast@student.ethz.ch> 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.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-08-20 20:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-20 18:24 [PATCH] parseopt: do not translate empty help string Thomas Rast
2012-08-20 19:21 ` Junio C Hamano
2012-08-20 20:10 ` Thomas Rast [this message]
2012-08-20 22:04 ` Junio C Hamano
2012-08-20 22:08 ` Junio C Hamano
2012-08-20 23:03 ` Thomas Rast
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=87obm5jpdy.fsf@thomas.inf.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.