Merge pull request #4436 from ace20022/ext_sub_details

 [Ext. subs] Use ISO639-2 T language codes for external subtitles details.

diff --git a/xbmc/cores/dvdplayer/DVDFileInfo.cpp b/xbmc/cores/dvdplayer/DVDFileInfo.cpp
index e2e2b01..fd104d9 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDFileInfo.cpp
+++ b/xbmc/cores/dvdplayer/DVDFileInfo.cpp
@@ -471,17 +471,10 @@ bool CDVDFileInfo::AddExternalSubtitleToDetails(const CStdString &path, CStreamD
       CStreamDetailSubtitle *dsub = new CStreamDetailSubtitle();
       CDemuxStream* stream = v.GetStream(i);
       std::string lang = stream->language;
-      if (lang.length() == 2)
-      {
-        CStdString lang3;
-        g_LangCodeExpander.ConvertToThreeCharCode(lang3, lang);
-        dsub->m_strLanguage = lang3;
-      }
-      else
-        dsub->m_strLanguage = lang;
-
-      return true;
+      dsub->m_strLanguage = g_LangCodeExpander.ConvertToISO6392T(lang);
+      details.AddStream(dsub);
     }
+    return true;
   }
   if(ext == ".sub")
   {
@@ -493,7 +486,7 @@ bool CDVDFileInfo::AddExternalSubtitleToDetails(const CStdString &path, CStreamD
   CStreamDetailSubtitle *dsub = new CStreamDetailSubtitle();
   ExternalStreamInfo info;
   CUtil::GetExternalStreamDetailsFromFilename(path, filename, info);
-  dsub->m_strLanguage = info.language;
+  dsub->m_strLanguage = g_LangCodeExpander.ConvertToISO6392T(info.language);
   details.AddStream(dsub);
 
   return true;