Index: src/plugin/PluginSettings.cpp |
=================================================================== |
--- a/src/plugin/PluginSettings.cpp |
+++ b/src/plugin/PluginSettings.cpp |
@@ -99,43 +99,17 @@ |
return hasInstance; |
} |
- |
- |
CString CPluginSettings::GetDataPath(const CString& filename) |
{ |
std::wstring path = ::GetAppDataPath() + L"\\" + static_cast<LPCWSTR>(filename); |
return CString(path.c_str()); |
} |
-CString CPluginSettings::GetSystemLanguage() |
-{ |
- CString language; |
- CString country; |
- |
- DWORD bufSize = 256; |
- int ccBuf = GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SISO639LANGNAME, language.GetBufferSetLength(bufSize), bufSize); |
- ccBuf = GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SISO3166CTRYNAME, country.GetBufferSetLength(bufSize), bufSize); |
- |
- if ((country.IsEmpty()) || (language.IsEmpty())) |
- { |
- return CString(); |
- } |
- CString lang; |
- lang.Append(language); |
- lang.Append(L"-"); |
- lang.Append(country); |
- |
- return lang; |
- |
-} |
- |
- |
bool CPluginSettings::IsPluginEnabled() const |
{ |
return GetPluginEnabled(); |
} |
- |
std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const |
{ |
std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions(); |
@@ -316,7 +290,7 @@ |
CString CPluginSettings::GetAppLocale() |
{ |
- return CPluginSystem::GetInstance()->GetBrowserLanguage(); |
+ return to_CString(GetBrowserLanguage()); |
} |
CString CPluginSettings::GetDocumentationLink() |