Fix for translating empty strings

minduser00 · sfan5 · commit 9a06d6aa9fa2 · 2018-04-09T15:13:53.000+02:00
Fix for incorrect translation of empty strings

In the key change menu, when a button key not have name an empty string is passed to gettext.
The empty string is reserved for gettext to return de header of the .po file an this is shoved in the button
diff --git a/src/gettext.h b/src/gettext.h
@@ -51,10 +51,11 @@ 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));
+	// 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)) : L"";
 }
 
 inline std::string strgettext(const std::string &text)
 {
-	return gettext(text.c_str());
+	return text.empty() ? "" : gettext(text.c_str());
 }

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,11 @@ 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`	`+ // We must check here that is not an empty string to avoid trying to translate it`
	`55`	`+ return str[0] ? utf8_to_wide_c(gettext(str)) : L"";`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`inline std::string strgettext(const std::string &text)`
`58`	`59`	`{`
`59`		`- return gettext(text.c_str());`
	`60`	`+ return text.empty() ? "" : gettext(text.c_str());`
`60`	`61`	`}`