Fix for translating empty string

minduser00 · SmallJoker · commit fd247d5f3e10 · 2018-04-09T11:02:03.000+02:00
diff --git a/src/gettext.h b/src/gettext.h
@@ -51,10 +51,19 @@ extern wchar_t *utf8_to_wide_c(const char *str);
 // The returned string is allocated using new
 inline const wchar_t *wgettext(const char *str)
 {
-	return utf8_to_wide_c(gettext(str));
+#if USE_GETTEXT
+	// We must check here that is not an empty string to avoid trying to translate it
+	return str[0] ? utf8_to_wide_c(gettext(str)) : utf8_to_wide_c("");
+#else
+	return utf8_to_wide_c(str);
+#endif
 }
 
 inline std::string strgettext(const std::string &text)
 {
-	return gettext(text.c_str());
+#if USE_GETTEXT
+	return text.empty() ? text.c_str() : gettext(text.c_str());
+#else
+	return text.c_str();
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,19 @@ extern wchar_t utf8_to_wide_c(const char str);`
`51`	`51`	`// The returned string is allocated using new`
`52`	`52`	`inline const wchar_t wgettext(const char str)`
`53`	`53`	`{`
`54`		`- return utf8_to_wide_c(gettext(str));`
	`54`	`+#if USE_GETTEXT`
	`55`	`+ // We must check here that is not an empty string to avoid trying to translate it`
	`56`	`+ return str[0] ? utf8_to_wide_c(gettext(str)) : utf8_to_wide_c("");`
	`57`	`+#else`
	`58`	`+ return utf8_to_wide_c(str);`
	`59`	`+#endif`
`55`	`60`	`}`
`56`	`61`
`57`	`62`	`inline std::string strgettext(const std::string &text)`
`58`	`63`	`{`
`59`		`- return gettext(text.c_str());`
	`64`	`+#if USE_GETTEXT`
	`65`	`+ return text.empty() ? text.c_str() : gettext(text.c_str());`
	`66`	`+#else`
	`67`	`+ return text.c_str();`
	`68`	`+#endif`
`60`	`69`	`}`