projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle ActiveBlockModifier intervals properly, down to 1s
[oweals/minetest.git]
/
src
/
gettext.h
diff --git
a/src/gettext.h
b/src/gettext.h
index 790375165a899e70ecf86e9cfa1cc19daa1d83d8..0e6ee0fd5f779965a1dc7d10caeb3f214c880284 100644
(file)
--- a/
src/gettext.h
+++ b/
src/gettext.h
@@
-1,4
+1,6
@@
+#ifndef GETTEXT_HEADER
#include "config.h" // for USE_GETTEXT
#include "config.h" // for USE_GETTEXT
+#include <iostream>
#if USE_GETTEXT
#include <libintl.h>
#if USE_GETTEXT
#include <libintl.h>
@@
-12,7
+14,10
@@
inline void init_gettext(const char *path) {
#if USE_GETTEXT
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
bindtextdomain(PROJECT_NAME, path);
textdomain(PROJECT_NAME);
#endif
@@
-26,6
+31,11
@@
inline wchar_t* chartowchar_t(const char *str)
return nstr;
}
return nstr;
}
+inline wchar_t* wgettext(const char *str)
+{
+ return chartowchar_t(gettext(str));
+}
+
inline void changeCtype(const char *l)
{
char *ret = NULL;
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;
}
else
std::cout<<"locale has been set to:"<<ret<<std::endl;
}
+#define GETTEXT_HEADER
+#endif