zmv7
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for translating empty strings 

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
master
minduser00 2018-03-27 11:49:47 +00:00 committed by sfan5
parent d58801ab32
commit 9a06d6aa9f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gettext.h
View File

@ -51,10 +51,11 @@ extern wchar_t *utf8_to_wide_c(const char *str);
// The returned string is allocated using new // The returned string is allocated using new
inline const wchar_t *wgettext(const char *str) 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) inline std::string strgettext(const std::string &text)
{ {
return gettext(text.c_str()); return text.empty() ? "" : gettext(text.c_str());
} }