From: Junio C Hamano Date: Mon, 20 Aug 2012 22:08:23 GMT Subject: Re: [PATCH] parseopt: do not translate empty help string Message-ID: <7vvcgdi5d4.fsf@alter.siamese.dyndns.org> In-Reply-To: <7vzk5pi5jn.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: >> 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 ;-). He, we need to update the log message a bit, too. -- >8 -- From: Thomas Rast Subject: [PATCH] gettext: do not translate empty string 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. Prevent us from passing empty strings to gettext. In some places, we run _(opts->help) where opts->help may be an empty string. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- gettext.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gettext.h b/gettext.h index 57ba8bb..376297b 100644 --- a/gettext.h +++ b/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); } -- 1.7.12.124.ga484625