Translated using Weblate (Japanese)

[oweals/minetest.git] / src / gettext.cpp

diff --git a/src/gettext.cpp b/src/gettext.cpp
index 85455ad3cb019785697b6b3284190b54e54ba581..e8819f1319be0d8cabd53255698c396df4371922 100644 (file)
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@@ -102,8 +102,9 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
 
        last_raw_value = shortname;
 
-       if (glb_supported_locales.find(narrow_to_wide(shortname)) != glb_supported_locales.end()) {
-               last_full_name = wide_to_narrow(glb_supported_locales[narrow_to_wide(shortname)]);
+       if (glb_supported_locales.find(utf8_to_wide(shortname)) != glb_supported_locales.end()) {
+               last_full_name = wide_to_utf8(
+                       glb_supported_locales[utf8_to_wide(shortname)]);
                return last_full_name.c_str();
        }
 
@@ -166,7 +167,7 @@ void init_gettext(const char *path, const std::string &configured_language) {
                        if (parameters != "") {
                                ptr_parameters = parameters.c_str();
                        }
-                       
+
                        /** users may start by short name in commandline without extention **/
                        std::string appname = argv[0];
                        if (appname.substr(appname.length() - 4) != ".exe") {
@@ -183,7 +184,7 @@ void init_gettext(const char *path, const std::string &configured_language) {
                                        NULL,
                                        &startupinfo,
                                        &processinfo)) {
-                               char buffer[1024];              
+                               char buffer[1024];
                                FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
                                        NULL,
                                        GetLastError(),
@@ -201,14 +202,14 @@ void init_gettext(const char *path, const std::string &configured_language) {
                        else {
                                exit(0);
                        }
+               }
 #else
-                       errorstream << "*******************************************************" << std::endl;
-                       errorstream << "Can't apply locale workaround for server!" << std::endl;
-                       errorstream << "Expect language to be broken!" << std::endl;
-                       errorstream << "*******************************************************" << std::endl;
+               errorstream << "*******************************************************" << std::endl;
+               errorstream << "Can't apply locale workaround for server!" << std::endl;
+               errorstream << "Expect language to be broken!" << std::endl;
+               errorstream << "*******************************************************" << std::endl;
 
 #endif
-               }
 
                setlocale(LC_ALL,configured_language.c_str());
 #else // Mingw
@@ -236,8 +237,9 @@ void init_gettext(const char *path, const std::string &configured_language) {
 #endif
 #endif
 
-       bindtextdomain(PROJECT_NAME_LOWER, path);
-       textdomain(PROJECT_NAME_LOWER);
+       static std::string name = lowercase(PROJECT_NAME);
+       bindtextdomain(name.c_str(), path);
+       textdomain(name.c_str());
 
 #if defined(_WIN32)
        // Set character encoding for Win32