Change typedef to normal definitions in GUI code

[dragonfireclient.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index b87bdd9cc3a523d4d76b605e0ad0acb3ced24400..42b375d869c2b6f1d246b5a09532aa1b3f79c496 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GETTEXT_HEADER
-#define GETTEXT_HEADER
+#pragma once
 
 #include "config.h" // for USE_GETTEXT
 #include <string>
@@ -52,12 +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)) : utf8_to_wide_c("");
 }
 
 inline std::string strgettext(const std::string &text)
 {
-       return gettext(text.c_str());
+       return text.empty() ? "" : gettext(text.c_str());
 }
-
-#endif