projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ObjectRef:punch and ObjectRef:right_click to Lua API
[oweals/minetest.git]
/
src
/
gettext.h
diff --git
a/src/gettext.h
b/src/gettext.h
index b62421c78d908c148b43c62638045df0d65804cd..0e6ee0fd5f779965a1dc7d10caeb3f214c880284 100644
(file)
--- a/
src/gettext.h
+++ b/
src/gettext.h
@@
-1,5
+1,6
@@
#ifndef GETTEXT_HEADER
#include "config.h" // for USE_GETTEXT
#ifndef GETTEXT_HEADER
#include "config.h" // for USE_GETTEXT
+#include <iostream>
#if USE_GETTEXT
#include <libintl.h>
#if USE_GETTEXT
#include <libintl.h>
@@
-13,8
+14,8
@@
inline void init_gettext(const char *path) {
#if USE_GETTEXT
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);
setlocale(LC_MESSAGES, "");
#endif
bindtextdomain(PROJECT_NAME, path);
@@
-30,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;