X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgettext.h;h=0e6ee0fd5f779965a1dc7d10caeb3f214c880284;hb=fadf248892eae825b57d283032594ed924d8dbea;hp=790375165a899e70ecf86e9cfa1cc19daa1d83d8;hpb=9baae3a701f7bdf50972d8381904d11eee77aa4e;p=oweals%2Fminetest.git

diff --git a/src/gettext.h b/src/gettext.h
index 790375165..0e6ee0fd5 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,4 +1,6 @@
+#ifndef GETTEXT_HEADER
 #include "config.h" // for USE_GETTEXT
+#include <iostream>
 
 #if USE_GETTEXT
 #include <libintl.h>
@@ -12,7 +14,10 @@
 
 inline void init_gettext(const char *path) {
 #if USE_GETTEXT
-	setlocale(LC_MESSAGES, "");
+	// 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);
 	textdomain(PROJECT_NAME);
 #endif
@@ -26,6 +31,11 @@ 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;
@@ -35,3 +45,5 @@ inline void changeCtype(const char *l)
 	else
 		std::cout<<"locale has been set to:"<<ret<<std::endl;
 }
+#define GETTEXT_HEADER
+#endif