X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgettext.h;h=54470cb0d863fc03ea25f04e2c5e9ca3bfd82649;hb=569fca53089b7b7e87b02edd44e2ad47166f7af6;hp=b62421c78d908c148b43c62638045df0d65804cd;hpb=c01c487c6226cbe72e63a7cd5519a5c87aa10f71;p=minetest.git

diff --git a/src/gettext.h b/src/gettext.h
index b62421c78..54470cb0d 100644
--- 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