master #7

Merged
BRNSystems merged 95 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-28 00:16:42 +01:00
Showing only changes of commit 0d41996562 - Show all commits

@ -119,7 +119,7 @@ static const char* MSVC_LocaleLookup(const char* raw_shortname)
return ""; return "";
} }
static void MSVC_LocaleWorkaround() static void MSVC_LocaleWorkaround(int argc, char* argv[])
{ {
errorstream << "MSVC localization workaround active. " errorstream << "MSVC localization workaround active. "
"Restarting " PROJECT_NAME_C " in a new environment!" << std::endl; "Restarting " PROJECT_NAME_C " in a new environment!" << std::endl;
@ -165,7 +165,6 @@ static void MSVC_LocaleWorkaround()
errorstream << "*******************************************************" << std::endl; errorstream << "*******************************************************" << std::endl;
} }
} }
}
#endif #endif
@ -195,7 +194,7 @@ void init_gettext(const char *path, const std::string &configured_language,
#ifndef SERVER #ifndef SERVER
// Hack to force gettext to see the right environment // Hack to force gettext to see the right environment
if (current_language != configured_language) if (current_language != configured_language)
MSVC_LocaleWorkaround(); MSVC_LocaleWorkaround(argc, argv);
#else #else
errorstream << "*******************************************************" << std::endl; errorstream << "*******************************************************" << std::endl;
errorstream << "Can't apply locale workaround for server!" << std::endl; errorstream << "Can't apply locale workaround for server!" << std::endl;