added: show scraper language in set content dialog

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23552 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

17 files changed, 27 insertions, 13 deletions

diff --git a/language/English/strings.xml b/language/English/strings.xml
index b7c239ca19..b57478d918 100644
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -1957,6 +1957,7 @@
   <string id="21415">Default musicvideo scraper</string>
   <string id="21416">Enable fallback based on scraper language</string>
   <string id="21417">- Scraper settings</string>
+  <string id="21418">Multilingual</string>
 
   <string id="21420">Value to match</string>
   <string id="21421">Smart playlist rule</string>
diff --git a/language/German (Austria)/strings.xml b/language/German (Austria)/strings.xml
index 3c3270d589..a1ec74cde5 100644
--- a/language/German (Austria)/strings.xml
+++ b/language/German (Austria)/strings.xml
@@ -1658,6 +1658,7 @@ Um abzubrechen, drücken Sie die 'Back'-Taste.</string>
   <string id="21414">Standard Serien Scraper</string>
   <string id="21415">Standard Musikvideo Scraper</string>
   <string id="21416">Aktiviere Alternativsuche für gleichsprachige Scraper</string>
+  <string id="21418">Mehrsprachig</string>
   <string id="21420">Wert zum angleichen</string>
   <string id="21421">Smart Playlist Regel</string>
   <string id="21422">Titel angleichen mit</string>
diff --git a/language/German/strings.xml b/language/German/strings.xml
index 67c47ad26d..aa09be061a 100644
--- a/language/German/strings.xml
+++ b/language/German/strings.xml
@@ -1820,6 +1820,7 @@
   <string id="21414">Standard Serien-Scraper</string>
   <string id="21415">Standard Musikvideo-Scraper</string>
   <string id="21416">Aktiviere Alternativsuche für gleichsprachige Scraper</string>
+  <string id="21418">Mehrsprachig</string>
   <string id="21420">Wert zum Angleichen</string>
   <string id="21421">Smart-Playlist-Regel</string>
   <string id="21422">Titel angleichen mit</string>
diff --git a/system/scrapers/music/allmusic_merlin_lastfm.xml b/system/scrapers/music/allmusic_merlin_lastfm.xml
index a7b30d7b85..d77ba8826b 100644
--- a/system/scrapers/music/allmusic_merlin_lastfm.xml
+++ b/system/scrapers/music/allmusic_merlin_lastfm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-09-16" name="allmusic &amp; merlin.pl &amp; lastfm.pl" content="albums" thumb="allmusic.gif">
+<scraper framework="1.1" date="2009-09-16" name="allmusic &amp; merlin.pl &amp; lastfm.pl" content="albums" thumb="allmusic.gif" language"pl">
 	<include>common/htbackdrops.xml</include>
 	<include>common/allmusic.xml</include>
 	<GetSettings dest="3">
diff --git a/system/scrapers/music/freebase.xml b/system/scrapers/music/freebase.xml
index 4399e47a5a..f953053b19 100644
--- a/system/scrapers/music/freebase.xml
+++ b/system/scrapers/music/freebase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-09-16" name="Freebase" content="albums" thumb="freebase.png">
+<scraper framework="1.1" date="2009-09-16" name="Freebase" content="albums" thumb="freebase.png" language="en">
 	<include>common/htbackdrops.xml</include>
 	<GetSettings dest="3">
 		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
diff --git a/system/scrapers/music/israel-music.xml b/system/scrapers/music/israel-music.xml
index 62010304ee..ea03292259 100644
--- a/system/scrapers/music/israel-music.xml
+++ b/system/scrapers/music/israel-music.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2009-05-22" name="IsraelMusic" content="albums" thumb="israel-music.png">
+<scraper framework="1.0" date="2009-05-22" name="IsraelMusic" content="albums" thumb="israel-music.png" language="he">
 	<NfoUrl dest="3">
 		<RegExp input="$$1" output="\1/" dest="3">
 			<expression>(http://he.israel-music.com.*)</expression>
diff --git a/system/scrapers/video/KinoPoisk.xml b/system/scrapers/video/KinoPoisk.xml
index 7fbef0ce05..f9f7c5e80d 100644
--- a/system/scrapers/video/KinoPoisk.xml
+++ b/system/scrapers/video/KinoPoisk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<scraper framework="1.1" date="2009-08-08" name="KinoPoisk_v2.001.ru" content="movies" thumb="KinoPoisk.gif" ServerContentEncoding="CP1251" language="ru">
+<scraper framework="1.1" date="2009-08-08" name="KinoPoisk" content="movies" thumb="KinoPoisk.gif" ServerContentEncoding="CP1251" language="ru">
 
 	<GetSettings dest="3">
 		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
diff --git a/system/scrapers/video/daum.xml b/system/scrapers/video/daum.xml
index 6b63f6c997..2d074362aa 100644
--- a/system/scrapers/video/daum.xml
+++ b/system/scrapers/video/daum.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-08-08" name="DAUM (Korean)" content="movies" thumb="daum.png" language="ko">
+<scraper framework="1.1" date="2009-08-08" name="Daum" content="movies" thumb="daum.png" language="ko">
 	<GetSettings dest="3">
 		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
 			<RegExp input="$$1" output="&lt;setting label=&quot;포스터&quot; type=&quot;bool&quot; id=&quot;EnableThumbs&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
diff --git a/system/scrapers/video/filmaffinity.xml b/system/scrapers/video/filmaffinity.xml
index 8b534445c8..8896768105 100644
--- a/system/scrapers/video/filmaffinity.xml
+++ b/system/scrapers/video/filmaffinity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<scraper framework="1.1" date="2009-09-25" content="movies" name="FilmAffinity.es (Spanish)" thumb="filmaffinity.gif" language="es">
+<scraper framework="1.1" date="2009-09-25" content="movies" name="FilmAffinity.es" thumb="filmaffinity.gif" language="es">
 	<include>common/tmdb.xml</include>
 	<include>common/movieposterdb.xml</include>
 	<include>common/impa.xml</include>
diff --git a/system/scrapers/video/imdb-cn.xml b/system/scrapers/video/imdb-cn.xml
index 29047f1524..d47790d824 100644
--- a/system/scrapers/video/imdb-cn.xml
+++ b/system/scrapers/video/imdb-cn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="gb2312"?>
-<scraper framework="1.1" date="2009-08-10" name="IMDb-CN(Chinese)" content="movies" thumb="imdb-cn.gif" language="zh">
+<scraper framework="1.1" date="2009-08-10" name="IMDb.cn" content="movies" thumb="imdb-cn.gif" language="zh">
 	<include>common/tmdb.xml</include>
 	<include>common/movieposterdb.xml</include>
 	<GetSettings dest="3">
diff --git a/system/scrapers/video/imdb.xml b/system/scrapers/video/imdb.xml
index 7cbdb81389..90ec2b6ce9 100644
--- a/system/scrapers/video/imdb.xml
+++ b/system/scrapers/video/imdb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-08-10" name="IMDb" content="movies" thumb="imdb.png" language="en">
+<scraper framework="1.1" date="2009-08-10" name="IMDb.com" content="movies" thumb="imdb.png" language="en">
 	<include>common/imdb.xml</include>
 	<include>common/tmdb.xml</include>
 	<include>common/movieposterdb.xml</include>
diff --git a/system/scrapers/video/mtime.xml b/system/scrapers/video/mtime.xml
index e79cc97edf..fa3e8dfa11 100644
--- a/system/scrapers/video/mtime.xml
+++ b/system/scrapers/video/mtime.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-08-04" name="Mtime(Chinese)" content="movies" thumb="mtime.jpg" language="zh">
+<scraper framework="1.1" date="2009-08-04" name="Mtime" content="movies" thumb="mtime.jpg" language="zh">
 	<GetSettings dest="3">
 		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
 			<RegExp input="$$1" output="&lt;setting label=&quot;Enable Fanart&quot; type=&quot;bool&quot; id=&quot;fanart&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
diff --git a/system/scrapers/video/mymoviesdk.xml b/system/scrapers/video/mymoviesdk.xml
index d8b0ffda1a..1d0fe2ab29 100644
--- a/system/scrapers/video/mymoviesdk.xml
+++ b/system/scrapers/video/mymoviesdk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2009-08-11" name="MyMovies.dk" content="movies" thumb="mymoviesdk.png" language="en" requiressettings="true">
+<scraper framework="1.1" date="2009-08-11" name="MyMovies.dk" content="movies" thumb="mymoviesdk.png" language="multi" requiressettings="true">
 	<GetSettings dest="3">
 		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
 			<!--Username-->
diff --git a/system/scrapers/video/naver.xml b/system/scrapers/video/naver.xml
index f72b5c41b8..9a54e7afd3 100644
--- a/system/scrapers/video/naver.xml
+++ b/system/scrapers/video/naver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-08-08" name="NAVER (Korean)" content="movies" thumb="naver.png" language="ko">
+<scraper framework="1.1" date="2009-08-08" name="NAVER" content="movies" thumb="naver.png" language="ko">
 	<include>common/tmdb.xml</include>
 	<GetSettings dest="3">
 		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
diff --git a/system/scrapers/video/sratim.xml b/system/scrapers/video/sratim.xml
index 5b28ecdc55..12689aee1d 100644
--- a/system/scrapers/video/sratim.xml
+++ b/system/scrapers/video/sratim.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2009-10-04" name="Sratim" content="movies" thumb="sratim.gif" language="il">
+<scraper framework="1.0" date="2009-10-04" name="Sratim" content="movies" thumb="sratim.gif" language="he">
 	<include>common/tmdb.xml</include>
 	<include>common/imdb.xml</include>
 	<GetSettings dest="3">
diff --git a/system/scrapers/video/worldart.xml b/system/scrapers/video/worldart.xml
index e7782029d0..3422860460 100644
--- a/system/scrapers/video/worldart.xml
+++ b/system/scrapers/video/worldart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="windows-1251" standalone="yes"?>
-<scraper framework="1.1" date="2009-09-13" content="movies" name="World Art Movies (Russian)" thumb="worldart.gif" language="ru">
+<scraper framework="1.1" date="2009-09-13" content="movies" name="World Art Movies" thumb="worldart.gif" language="ru">
 	<include>common/tmdb.xml</include>
 	<include>common/imdb.xml</include>
 	<GetSettings dest="3">
diff --git a/xbmc/GUIDialogContentSettings.cpp b/xbmc/GUIDialogContentSettings.cpp
index 32fd24b296..7c31998232 100644
--- a/xbmc/GUIDialogContentSettings.cpp
+++ b/xbmc/GUIDialogContentSettings.cpp
@@ -31,6 +31,7 @@
 #include "FileItem.h"
 #include "GUISettings.h"
 #include "LocalizeStrings.h"
+#include "LangCodeExpander.h"
 
 #define CONTROL_CONTENT_TYPE        3
 #define CONTROL_SCRAPER_LIST        4
@@ -383,6 +384,16 @@ void CGUIDialogContentSettings::FillListControl()
   {
     CFileItemPtr item(new CFileItem(iter->strTitle));
     item->m_strPath = iter->strPath;
+
+    CStdString strLanguage;
+
+    if (iter->strLanguage.Equals("multi"))
+      strLanguage = g_localizeStrings.Get(21418);
+    else
+      g_LangCodeExpander.Lookup(strLanguage, iter->strLanguage); 
+
+    item->SetLabel(iter->strTitle + " (" + strLanguage + ")");
+
     CStdString baseDir = GetScraperDirectory(*iter);
     if (!baseDir.IsEmpty())
       item->SetThumbnailImage(baseDir + iter->strThumb);