Merge branch 'tr/maint-parseopt-avoid-empty'

gitster · gitster · commit 800981f40df7 · 2012-09-07T11:08:10.000-07:00
A workaround to avoid doing _(""), which translates to unwanted
magic string in the .po files.

* tr/maint-parseopt-avoid-empty:
  gettext: do not translate empty string
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ extern int use_gettext_poison(void);`
`44`	`44`
`45`	`45`	`static inline FORMAT_PRESERVING(1) const char _(const char msgid)`
`46`	`46`	`{`
	`47`	`+ if (!*msgid)`
	`48`	`+ return "";`
`47`	`49`	`return use_gettext_poison() ? "# GETTEXT POISON #" : gettext(msgid);`
`48`	`50`	`}`
`49`	`51`