Merge pull request xbmc#6524 from Montellese/addons_fix_language_filter

[win32] addons: fix filtering foreign language addons
anssih · Feb 23, 2015 · 5e459f2 · 5e459f2
2 parents 1f7566a + 978cb20
commit 5e459f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/xbmc/LangInfo.cpp b/xbmc/LangInfo.cpp
@@ -535,12 +535,9 @@ const std::string CLangInfo::GetDVDSubtitleLanguage() const
   return code;
 }
 
-const std::string CLangInfo::GetLanguageLocale(bool twochar /* = false */) const
+const std::string& CLangInfo::GetLanguageLocale() const
 {
-  if (twochar)
-    return m_currentRegion->m_strLangLocaleCodeTwoChar;
-
-  return m_currentRegion->m_strLangLocaleName;
+  return m_currentRegion->m_strLangLocaleCodeTwoChar;
 }
 
 const std::string& CLangInfo::GetRegionLocale() const

diff --git a/xbmc/LangInfo.h b/xbmc/LangInfo.h
@@ -76,7 +76,11 @@ class CLangInfo : public ISettingCallback
   const std::string& GetTimeZone() const;
 
   const std::string& GetRegionLocale() const;
-  const std::string GetLanguageLocale(bool twochar = false) const;
+
+  /*!
+   \brief Returns the two character ISO 639-1 language code of the current language.
+   */
+  const std::string& GetLanguageLocale() const;
 
   bool ForceUnicodeFont() const { return m_currentRegion->m_forceUnicodeFont; }
 

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
@@ -631,7 +631,7 @@ std::string CAddonMgr::GetTranslatedString(const cp_cfg_element_t *root, const c
     if (strcmp(tag, child.name) == 0)
     { // see if we have a "lang" attribute
       const char *lang = m_cpluff->lookup_cfg_value((cp_cfg_element_t*)&child, "@lang");
-      if (lang && 0 == strcmp(lang,g_langInfo.GetLanguageLocale(true).c_str()))
+      if (lang && 0 == strcmp(lang,g_langInfo.GetLanguageLocale().c_str()))
         return child.value ? child.value : "";
       if (!lang || 0 == strcmp(lang, "en"))
         eng = &child;

diff --git a/xbmc/addons/GUIWindowAddonBrowser.cpp b/xbmc/addons/GUIWindowAddonBrowser.cpp
@@ -375,11 +375,8 @@ bool CGUIWindowAddonBrowser::GetDirectory(const std::string& strDirectory,
       int i=0;
       while (i < items.Size())
       {
-        if (!FilterVar(CSettings::Get().GetBool("general.addonforeignfilter"),
-                      items[i]->GetProperty("Addon.Language"), "en") ||
-            !FilterVar(CSettings::Get().GetBool("general.addonforeignfilter"),
-                      items[i]->GetProperty("Addon.Language"),
-                      g_langInfo.GetLanguageLocale()))
+        if (!FilterVar(true, items[i]->GetProperty("Addon.Language"), "en") ||
+            !FilterVar(true, items[i]->GetProperty("Addon.Language"), g_langInfo.GetLanguageLocale()))
         {
           i++;
         }