Add auto-detection of user language on Mac OS X (closes issue 1687)

This commit is contained in:
Philip Rinn
2013-01-23 17:31:10 +01:00
parent 7b0cda5c61
commit 878594f479

View File

@@ -102,7 +102,7 @@ bool MultiLangMgr::isOSLanguageDetectSupported() {
#else #else
return false; return false;
#endif #endif
#elif __linux__ #elif __linux__ || __APPLE__
return true; return true;
#else #else
return false; return false;
@@ -116,7 +116,6 @@ Glib::ustring MultiLangMgr::getOSUserLanguage() {
if (isOSLanguageDetectSupported()) { if (isOSLanguageDetectSupported()) {
// TODO: Add support for other OS here
#ifdef WIN32 #ifdef WIN32
// When using old versions of MINGW this is not defined // When using old versions of MINGW this is not defined
#ifdef __MINGW64_VERSION_MAJOR #ifdef __MINGW64_VERSION_MAJOR
@@ -130,7 +129,7 @@ Glib::ustring MultiLangMgr::getOSUserLanguage() {
langName=TranslateRFC2Language(localRFC); langName=TranslateRFC2Language(localRFC);
} }
#endif #endif
#elif __linux__ #elif __linux__ || __APPLE__
langName = TranslateRFC2Language(std::setlocale(LC_CTYPE,"")); langName = TranslateRFC2Language(std::setlocale(LC_CTYPE,""));
#endif #endif
} }