Always return from non-void functions

[dragonfireclient.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index 7c3a6ffab6799049cfab1b0f3e9953402f36aa50..0e6ee0fd5f779965a1dc7d10caeb3f214c880284 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,3 +1,7 @@
+#ifndef GETTEXT_HEADER
+#include "config.h" // for USE_GETTEXT
+#include <iostream>
+
 #if USE_GETTEXT
 #include <libintl.h>
 #else
@@ -10,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
@@ -23,3 +30,20 @@ inline wchar_t* chartowchar_t(const char *str)
        mbstowcs(nstr, str, l);
        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;
+       else
+               std::cout<<"locale has been set to:"<<ret<<std::endl;
+}
+#define GETTEXT_HEADER
+#endif