X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/07c8a0395bd3df78c2c885b848f500c99b1c4407..5e214d181d1590e0002eabdc6f8395cd6ddde2a7:/lib/python/Screens/Subtitles.py

diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py
index 31733d80..54bc7a5b 100644
--- a/lib/python/Screens/Subtitles.py
+++ b/lib/python/Screens/Subtitles.py
@@ -30,10 +30,11 @@ class Subtitles(Screen, ConfigListScreen):
 		self.__selected_subtitle = None
 
 	def fillList(self):
-		del self.list[:]
-		print "self.list", self.list
+		list = self.list
+		del list[:]
+		print "self.list", list
 		if self.subtitlesEnabled():
-			self.list.append(getConfigListEntry(_("Disable Subtitles"), ConfigNothing(), None))
+			list.append(getConfigListEntry(_("Disable Subtitles"), ConfigNothing(), None))
 			sel = self.infobar.selected_subtitle
 		else:
 			sel = None
@@ -44,28 +45,29 @@ class Subtitles(Screen, ConfigListScreen):
 				text = _("Enable")
 			if x[0] == 0:
 				if LanguageCodes.has_key(x[4]):
-					self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+					list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
 				else:
-					self.list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
+					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")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
+					list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
 				else:
 					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))
+						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))
+						list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
 			elif x[0] == 2:
+				types = (" UTF-8 text "," SSA / AAS "," .SRT file ")
 				if x[4] == 'und': #undefined
-					self.list.append(getConfigListEntry(text+" subtitle stream %d " % x[1], ConfigNothing(), x))
+					list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d" % x[1], ConfigNothing(), x))
 				else:
 					if LanguageCodes.has_key(x[4]):
-						self.list.append(getConfigListEntry(text+" subtitle stream %d " % x[1] +LanguageCodes[x[4]][0], ConfigNothing(), x))
+						list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles") + ' ' + LanguageCodes[x[4]][0], ConfigNothing(), x))
 					else:
-						self.list.append(getConfigListEntry(text+" subtitle stream %d " % x[1] +x[4], ConfigNothing(), x))
+						list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d " % x[1] +x[4], ConfigNothing(), x))
 #		return _("Disable subtitles")
-		self["config"].list = self.list
-		self["config"].l.setList(self.list)
+		self["config"].list = list
+		self["config"].l.setList(list)
 
 	def __updatedInfo(self):
 		self.fillList()
@@ -94,7 +96,7 @@ class Subtitles(Screen, ConfigListScreen):
 		ConfigListScreen.keyRight(self)
 
 	def ok(self):
-		if len(self.list):
+		if self.list:
 			cur = self["config"].getCurrent()
 			self.enableSubtitle(cur[2])
 		self.close(1)