Disable word wrap in vertical texts in main menu

[minetest.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index b62421c78d908c148b43c62638045df0d65804cd..54470cb0d863fc03ea25f04e2c5e9ca3bfd82649 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,5 +1,6 @@
 #ifndef GETTEXT_HEADER
 #include "config.h" // for USE_GETTEXT
+#include "log.h"
 
 #if USE_GETTEXT
 #include <libintl.h>
@@ -13,8 +14,8 @@
 
 inline void init_gettext(const char *path) {
 #if USE_GETTEXT
-       #if MSVC
-       #else
+       // don't do this if MSVC compiler is used, it gives an assertion fail
+       #ifndef _MSC_VER
                setlocale(LC_MESSAGES, "");
        #endif
        bindtextdomain(PROJECT_NAME, path);
@@ -30,14 +31,19 @@ inline wchar_t* chartowchar_t(const char *str)
        return nstr;
 }
 
+inline wchar_t* wgettext(const char *str)
+{
+       return chartowchar_t(gettext(str));
+}
+
 inline void changeCtype(const char *l)
 {
        char *ret = NULL;
        ret = setlocale(LC_CTYPE, l);
        if(ret == NULL)
-               std::cout<<"locale could not be set"<<std::endl;
+               infostream<<"locale could not be set"<<std::endl;
        else
-               std::cout<<"locale has been set to:"<<ret<<std::endl;
+               infostream<<"locale has been set to:"<<ret<<std::endl;
 }
 #define GETTEXT_HEADER
 #endif