small optimizations and cleanups by Moritz Venn

[enigma2.git] / lib / python / Screens / LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 94ede08cff9cb0288553dbf7b840f80dbf746025..082daa5562ebf463dc54c571c03ae540549b2937 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -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):