| Index: Shared/PluginSystem.cpp |
| =================================================================== |
| --- a/Shared/PluginSystem.cpp |
| +++ b/Shared/PluginSystem.cpp |
| @@ -61,12 +61,15 @@ |
| CString CPluginSystem::GetBrowserLanguage() const |
| { |
| - CString browserLanguage; |
| - |
| LANGID lcid = ::GetUserDefaultLangID(); |
| TCHAR language[128]; |
| memset(language, 0, sizeof(language)); |
| + TCHAR country[128]; |
| + memset(language, 0, sizeof(country)); |
| + |
| + CString lang; |
| + |
| int res = ::GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, language, 127); |
| if (res == 0) |
| { |
| @@ -74,10 +77,23 @@ |
| } |
| else |
| { |
| - browserLanguage = language; |
| + lang.Append(language); |
| } |
| - return browserLanguage; |
| + lang.Append(L"-"); |
| + |
| + |
| + res = ::GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, country, 127); |
| + if (res == 0) |
| + { |
| + DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_SYSINFO, PLUGIN_ERROR_SYSINFO_BROWSER_LANGUAGE, "System::GetBrowserLang - failed to retrieve country"); |
| + } |
| + else |
| + { |
| + lang.Append(country); |
| + } |
| + |
| + return lang; |
| } |