add proper country names, add spanish

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 4ec28081b0956f96b8063713c8cde3613246f38e..076977158aef295f1ccc6359dc46983a14cfa79a 100644 (file)
--- 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 3d74cb148d26613388dd2b79358624b2bb8865ce..c15b600459059ae395f2ecbbcb5da8fb697e7217 100644 (file)
--- 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 399e20ec6509ad82b5056b7932ec077b7c42deb8..b9efd8b437abc8d6c239104941b38be1a5760f80 100644 (file)
--- 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)