X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FLanguageSelection.py;h=e845d84b571794889a5226274989095a61f0a035;hp=a0441b6d6aa49a2b389f4abc8707c22d58a2995a;hb=c1311444ea249a45d0eceefa15d77fce410a54da;hpb=90d9f3e7624282749eb59b57d4996f5d1d06c6b1;ds=sidebyside

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index a0441b6..e845d84 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -3,17 +3,22 @@ from Screen import Screen
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Language import language
+from Components.LanguageList import *
+from Components.config import config
+
 
 class LanguageSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
 		self.list = []
-		list = language.getLanguageList()
-		for x in list:
-			self.list.append((x, None))
-
-		self["list"] = MenuList(self.list)
+		if len(language.lang) == 0: # no language available => display only english
+			self.list.append(LanguageEntryComponent("en", _("English")))
+		else:
+			for x in language.lang:
+				self.list.append(LanguageEntryComponent(x[2], x[0]))
+		
+		self["list"] = LanguageList(self.list)
 		
 		self["actions"] = ActionMap(["OkCancelActions"], 
 		{
@@ -27,3 +32,5 @@ class LanguageSelection(Screen):
 	
 	def run(self):
 		language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
+		config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+		config.osd.language.save()