Issue #276 - eliminate CString from GetBrowserLanguage

src/plugin/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
@@ skipping 81 matching lines @@
 
   s_criticalSectionLocal.Lock();
   {
     hasInstance = s_instance != NULL;
   }
   s_criticalSectionLocal.Unlock();
 
   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();
 
   std::map<CString, CString> filterList;
   for (size_t i = 0; i < subscriptions.size(); i ++)
   {
     SubscriptionDescription it = subscriptions[i];
     filterList.insert(std::make_pair(CString(it.url.c_str()), CString(it.title.c_str())));
   }
@@ skipping 160 matching lines @@
     if (subscription->url != aaUrl)
     {
       return CString(subscription->url.c_str());
     }
   }
   return CString(L"");
 }
 
 CString CPluginSettings::GetAppLocale()
 {
-  return CPluginSystem::GetInstance()->GetBrowserLanguage();
+  return to_CString(GetBrowserLanguage());
 }
 
 CString CPluginSettings::GetDocumentationLink()
 {
   return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
 }
 
 
 
 #endif // SUPPORT_WHITELIST