diff options
Diffstat (limited to 'src/utils/gettexthelper.cpp')
| -rw-r--r-- | src/utils/gettexthelper.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp index 0069b0bfd..84a6e8602 100644 --- a/src/utils/gettexthelper.cpp +++ b/src/utils/gettexthelper.cpp @@ -34,10 +34,10 @@ #include <libintl.h> #include <locale.h> -#ifdef WIN32 +#ifdef _WIN32 #include <string> extern "C" char const *_nl_locale_name_default(void); -#endif // WIN32 +#endif // _WIN32 #elif defined(ENABLE_CUSTOMNLS) #include "utils/translation/podict.h" #ifdef __native_client__ @@ -45,9 +45,9 @@ extern "C" char const *_nl_locale_name_default(void); #endif // __native_client__ #endif // ENABLE_NLS -#if defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) && !defined(WIN32) +#if defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) #include "utils/env.h" -#endif // defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) && !defined(WIN32) +#endif // defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) #include "debug.h" @@ -55,7 +55,7 @@ extern "C" char const *_nl_locale_name_default(void); static std::string setLangEnv() { std::string lang = config.getStringValue("lang"); -#if defined(ENABLE_NLS) && defined(WIN32) +#if defined(ENABLE_NLS) && defined(_WIN32) if (lang.empty()) lang = std::string(_nl_locale_name_default()); #elif defined(ENABLE_CUSTOMNLS) && defined(__native_client__) @@ -66,18 +66,12 @@ static std::string setLangEnv() naclPostMessage("get-uilanguage", ""); lang = naclWaitForMessage(handle); } -#endif // defined(ENABLE_NLS) && defined(WIN32) +#endif // defined(ENABLE_NLS) && defined(_WIN32) if (!lang.empty()) { -#ifdef WIN32 - putenv(const_cast<char*>(("LANG=" + lang).c_str())); - putenv(const_cast<char*>(("LANGUAGE=" + lang).c_str())); -#else // WIN32 - - setEnv("LANG", lang.c_str()); + setEnv("LANG", lang.c_str()); setEnv("LANGUAGE", lang.c_str()); -#endif // WIN32 } return lang; @@ -88,11 +82,11 @@ void GettextHelper::initLang() { #ifdef ENABLE_NLS const std::string lang = setLangEnv(); -#ifdef WIN32 +#ifdef _WIN32 // mingw doesn't like LOCALEDIR to be defined for some reason if (lang != "C") bindTextDomain("translations/"); -#else // WIN32 +#else // _WIN32 #ifdef ANDROID #ifdef USE_SDL2 bindTextDomain((std::string(getenv("APPDIR")).append("/locale")).c_str()); @@ -115,7 +109,7 @@ void GettextHelper::initLang() #endif // __APPLE__ #endif // ENABLE_PORTABLE #endif // ANDROID -#endif // WIN32 +#endif // _WIN32 char *locale = setlocale(LC_MESSAGES, lang.c_str()); if (locale) @@ -130,8 +124,8 @@ void GettextHelper::initLang() else logger->log("locale empty"); } - bind_textdomain_codeset("manaplus", "UTF-8"); - textdomain("manaplus"); + bind_textdomain_codeset("manaverse", "UTF-8"); + textdomain("manaverse"); #elif defined(ENABLE_CUSTOMNLS) mainTranslator = new PoDict("en"); setLangEnv(); @@ -141,7 +135,7 @@ void GettextHelper::initLang() #ifdef ENABLE_NLS void GettextHelper::bindTextDomain(const char *const path) { - const char *const dir = bindtextdomain("manaplus", path); + const char *const dir = bindtextdomain("manaverse", path); if (dir) logger->log("bindtextdomain: %s", dir); else |