diff options
| author | Pär Björklund <per.bjorklund@gmail.com> | 2015-10-10 11:44:41 +0200 |
|---|---|---|
| committer | Pär Björklund <per.bjorklund@gmail.com> | 2015-10-10 11:44:41 +0200 |
| commit | 639d99b1c1cb3fea24d40159f1f3e9ce8c5213b9 (patch) | |
| tree | e2de49128edf8b20cd1e0045ae3835012deff1db | |
| parent | 9c5bddaf29fda4ed193a096e3d2c9efb6f329e53 (diff) | |
| parent | 4bdf334223c5d5882a09f0f0c47f27705d5fb460 (diff) | |
Merge pull request #7820 from taxigps/getlocale
fixed: setlocale issue other than windows
| -rw-r--r-- | xbmc/LangInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/LangInfo.cpp b/xbmc/LangInfo.cpp index fe09e21fbc..afbd724f81 100644 --- a/xbmc/LangInfo.cpp +++ b/xbmc/LangInfo.cpp @@ -263,13 +263,13 @@ void CLangInfo::CRegion::SetGlobalLocale() std::string strLocale; if (m_strRegionLocaleName.length() > 0) { +#ifdef TARGET_WINDOWS std::string strLang, strRegion; g_LangCodeExpander.ConvertToISO6391(m_strLangLocaleName, strLang); g_LangCodeExpander.ConvertToISO6391(m_strRegionLocaleName, strRegion); -#ifdef TARGET_WINDOWS strLocale = strLang + "-" + strRegion; #else - strLocale = strLang + "_" + strRegion; + strLocale = m_strLangLocaleName + "_" + m_strRegionLocaleName; #endif #ifdef TARGET_POSIX strLocale += ".UTF-8"; |