[LangInfo] Use gui's language for dvd/bluray menus.

diff --git a/xbmc/LangInfo.cpp b/xbmc/LangInfo.cpp
index f926c39..f9529ec 100644 (file)
--- a/xbmc/LangInfo.cpp
+++ b/xbmc/LangInfo.cpp
@@ -483,9 +483,13 @@ void CLangInfo::SetSubtitleLanguage(const CStdString &language)
 }
 
 // two character codes as defined in ISO639
-const CStdString& CLangInfo::GetDVDMenuLanguage() const
+const std::string CLangInfo::GetDVDMenuLanguage() const
 {
-  return m_currentRegion->m_strDVDMenuLanguage;
+  CStdString code;
+  if (!g_LangCodeExpander.ConvertToTwoCharCode(code, m_currentRegion->m_strLangLocaleName))
+    code = m_currentRegion->m_strDVDMenuLanguage;
+  
+  return code;
 }
 
 // two character codes as defined in ISO639

diff --git a/xbmc/LangInfo.h b/xbmc/LangInfo.h
index 80c7118..b13bd44 100644 (file)
--- a/xbmc/LangInfo.h
+++ b/xbmc/LangInfo.h
@@ -57,7 +57,7 @@ public:
   // or a language name in english (as used by XBMC)
   void SetSubtitleLanguage(const CStdString &language);
 
-  const CStdString& GetDVDMenuLanguage() const;
+  const std::string GetDVDMenuLanguage() const;
   const std::string GetDVDAudioLanguage() const;
   const std::string GetDVDSubtitleLanguage() const;
   const CStdString& GetTimeZone() const;