thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIN32: Move Windows-specific implementation of getSystemLanguage out of OSystem_SDL

Browse source
This commit is contained in:
Cameron Cawley 2018-05-27 22:14:06 +01:00 • committed by Thierry Crozat
parent 6f60ef55ad
commit e1c83f8e87
3 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
backends/platform/sdl/sdl.cpp
View file

@ -436,27 +436,7 @@ void OSystem_SDL::logMessage(LogMessageType::Type type, const char *message) {
} }
Common::String OSystem_SDL::getSystemLanguage() const { Common::String OSystem_SDL::getSystemLanguage() const {
#if defined(USE_DETECTLANG) && !defined(_WIN32_WCE) #if defined(USE_DETECTLANG) && !defined(WIN32)
#ifdef WIN32
// We can not use "setlocale" (at least not for MSVC builds), since it
// will return locales like: "English_USA.1252", thus we need a special
// way to determine the locale string for Win32.
char langName[9];
char ctryName[9];
const LCID languageIdentifier = GetUserDefaultUILanguage();
if (GetLocaleInfo(languageIdentifier, LOCALE_SISO639LANGNAME, langName, sizeof(langName)) != 0 &&
GetLocaleInfo(languageIdentifier, LOCALE_SISO3166CTRYNAME, ctryName, sizeof(ctryName)) != 0) {
Common::String localeName = langName;
localeName += "_";
localeName += ctryName;
return localeName;
} else {
return ModularBackend::getSystemLanguage();
}
#else // WIN32
// Activating current locale settings // Activating current locale settings
const Common::String locale = setlocale(LC_ALL, ""); const Common::String locale = setlocale(LC_ALL, "");
@ -484,7 +464,6 @@ Common::String OSystem_SDL::getSystemLanguage() const {
return Common::String(locale.c_str(), length); return Common::String(locale.c_str(), length);
} }
#endif // WIN32
#else // USE_DETECTLANG #else // USE_DETECTLANG
return ModularBackend::getSystemLanguage(); return ModularBackend::getSystemLanguage();
#endif // USE_DETECTLANG #endif // USE_DETECTLANG

25
backends/platform/sdl/win32/win32.cpp
View file

@ -150,6 +150,31 @@ bool OSystem_Win32::openUrl(const Common::String &url) {
return true; return true;
} }
Common::String OSystem_Win32::getSystemLanguage() const {
#if defined(USE_DETECTLANG) && defined(USE_TRANSLATION)
// We can not use "setlocale" (at least not for MSVC builds), since it
// will return locales like: "English_USA.1252", thus we need a special
// way to determine the locale string for Win32.
char langName[9];
char ctryName[9];
const LCID languageIdentifier = GetUserDefaultUILanguage();
if (GetLocaleInfo(languageIdentifier, LOCALE_SISO639LANGNAME, langName, sizeof(langName)) != 0 &&
GetLocaleInfo(languageIdentifier, LOCALE_SISO3166CTRYNAME, ctryName, sizeof(ctryName)) != 0) {
Common::String localeName = langName;
localeName += "_";
localeName += ctryName;
return localeName;
} else {
return ModularBackend::getSystemLanguage();
}
#endif // USE_DETECTLANG
// Falback to SDL implementation
return OSystem_SDL::getSystemLanguage();
}
Common::String OSystem_Win32::getScreenshotsPath() { Common::String OSystem_Win32::getScreenshotsPath() {
Common::String screenshotsPath = ConfMan.get("screenshotpath"); Common::String screenshotsPath = ConfMan.get("screenshotpath");
if (!screenshotsPath.empty()) { if (!screenshotsPath.empty()) {

2
backends/platform/sdl/win32/win32.h
View file

@ -38,6 +38,8 @@ public:
virtual bool openUrl(const Common::String &url); virtual bool openUrl(const Common::String &url);
virtual Common::String getSystemLanguage() const;
virtual Common::String getScreenshotsPath(); virtual Common::String getScreenshotsPath();
protected: protected: