From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 19 Jan 2006 12:39:43 +0000 (+0000)
Subject: add proper country names, add spanish
X-Git-Tag: 2.6.0~4363
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/93974573b926821a824f68a69a2a8595beba9f4d

add proper country names, add spanish
---

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 4ec28081..07697715 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -9,14 +9,16 @@ class Language:
 		self.activeLanguage = 0
 		self.lang = []
 		# FIXME make list dynamically
-		self.addLanguage(_("English"), "en")
-		self.addLanguage(_("German"), "de")
-		self.addLanguage(_("Arabic"), "ar")
-		self.addLanguage(_("Dutch"), "nl")
+		# name, iso-639 language, iso-3166 country. Please don't mix language&country!
+		self.addLanguage(_("English"), "en", "EN")
+		self.addLanguage(_("German"), "de", "DE")
+		self.addLanguage(_("Arabic"), "ar", "AE")
+		self.addLanguage(_("Dutch"), "nl", "NL")
+		self.addLanguage(_("Spanish"), "es", "ES")
 
-	def addLanguage(self, name, lang):
+	def addLanguage(self, name, lang, country):
 		try:
-			self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang))
+			self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
 		except:
 			print "Language " + str(name) + " not found"
 
diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index 3d74cb14..c15b6004 100644
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -26,7 +26,6 @@ def LanguageEntryComponent(file, name):
 	
 	return res
 
-
 class LanguageList(HTMLComponent, GUIComponent, MenuList):
 	def __init__(self, list):
 		GUIComponent.__init__(self)
@@ -39,4 +38,3 @@ class LanguageList(HTMLComponent, GUIComponent, MenuList):
 		self.instance = eListbox(parent)
 		self.instance.setContent(self.l)
 		self.instance.setItemHeight(50)
-
diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 399e20ec..b9efd8b4 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -39,7 +39,7 @@ class LanguageSelection(Screen):
 			self.list.append(LanguageEntryComponent("en", _("English")))
 		else:
 			for x in language.lang:
-				self.list.append(LanguageEntryComponent(x[2], _(x[0])))
+				self.list.append(LanguageEntryComponent(x[3].lower(), _(x[0])))
 		
 		self["list"].l.setList(self.list)