X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/66ebad610be86be6a48c793b4c9c80794d66ad55..e03708b0a361c236d7034f35e4585edd4a91bb34:/lib/python/Screens/LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
old mode 100644
new mode 100755
index 94ede08c..fce10ac5
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -13,14 +13,14 @@ def _cached(x):
 
 from Screens.Rc import Rc
 
-from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
+from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN
 
 from Tools.LoadPixmap import LoadPixmap
 
 def LanguageEntryComponent(file, name, index):
-	png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/" + file + ".png"))
+	png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + file + ".png"))
 	if png == None:
-		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
+		png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/missing.png"))
 	res = (index, name, png)
 	return res
 
@@ -76,21 +76,22 @@ class LanguageSelection(Screen):
 		print "ok"
 
 	def updateList(self):
-		first_time = len(self.list) == 0
+		first_time = not self.list
 
-		self.list = []
-		if len(language.getLanguageList()) == 0: # no language available => display only english
-			self.list.append(LanguageEntryComponent("en", _cached("en_EN"), "en_EN"))
+		languageList = language.getLanguageList()
+		if not languageList: # no language available => display only english
+			list = [ LanguageEntryComponent("en", _cached("en_EN"), "en_EN") ]
 		else:
-			for x in language.getLanguageList():
-				self.list.append(LanguageEntryComponent(file = x[1][2].lower(), name = _cached("%s_%s" % x[1][1:3]), index = x[0]))
-		#self.list.sort(key=lambda x: x[1][7])
+			list = [ LanguageEntryComponent(file = x[1][2].lower(), name = _cached("%s_%s" % x[1][1:3]), index = x[0]) for x in languageList]
+		self.list = list
+
+		#list.sort(key=lambda x: x[1][7])
 
 		print "updateList"
 		if first_time:
-			self["languages"].list = self.list
+			self["languages"].list = list
 		else:
-			self["languages"].updateList(self.list)
+			self["languages"].updateList(list)
 		print "done"
 
 	def changed(self):