summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminduser00 <minduser00@users.noreply.github.com>2018-03-27 11:49:47 +0000
committersfan5 <sfan5@live.de>2018-04-09 15:13:53 +0200
commit9a06d6aa9fa2676a3fb4fa494f9318d0c5d7becb (patch)
tree87f34f4e8ad0b522ca0fd6a7b9e0132a68645cf8
parentd58801ab3204757e6c49892a05633281144f4f44 (diff)
downloadminetest-9a06d6aa9fa2676a3fb4fa494f9318d0c5d7becb.tar.gz
minetest-9a06d6aa9fa2676a3fb4fa494f9318d0c5d7becb.tar.bz2
minetest-9a06d6aa9fa2676a3fb4fa494f9318d0c5d7becb.zip
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
-rw-r--r--src/gettext.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gettext.h b/src/gettext.h
index d7fc586c0..4038e3fa8 100644
--- 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());
}