X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/619983c4f596e3371c58c52dd725680846376484..a029953596adaed49a5b0346acd5a867eff91a57:/lib/python/Screens/Subtitles.py

diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py
index 6a1deedb..e3cdd71a 100644
--- a/lib/python/Screens/Subtitles.py
+++ b/lib/python/Screens/Subtitles.py
@@ -1,8 +1,7 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.ConfigList import ConfigListScreen
 from Components.config import config, getConfigListEntry, ConfigNothing
-from Components.Label import Label
 
 from Tools.ISO639 import LanguageCodes
 
@@ -25,17 +24,23 @@ class Subtitles(Screen, ConfigListScreen):
 		else:
 			sel = None
 		for x in self.getSubtitleList():
-			if sel and sel == x:
+			if sel and sel[:4] == x[:4]: #ignore Language code in compare
 				text = _("Running")
 			else:
 				text = _("Enable")
 			if x[0] == 0:
-				self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+				if LanguageCodes.has_key(x[4]):
+					self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+				else:
+					self.list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
 			elif x[0] == 1:
 				if x[4] == 'und': #undefined
-					self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" "+str(x[2])+"/"+str(x[3]), ConfigNothing(), x))
+					self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
 				else:
-					self.list.append(getConfigListEntry(text+" TTX "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+					if LanguageCodes.has_key(x[4]):
+						self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+					else:
+						self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
 #		return _("Disable subtitles")
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
@@ -50,7 +55,6 @@ class Subtitles(Screen, ConfigListScreen):
 
 	def enableSubtitle(self, subtitles):
 		if self.infobar.selected_subtitle != subtitles:
-			print "enable subtitles", subtitles
 			self.infobar.subtitles_enabled = False
 			self.infobar.selected_subtitle = subtitles
 			self.infobar.subtitles_enabled = True