X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/061f02110eeeb6f8b44b2d3229a098c3c270f10c..29f60fdaf6f0ff1dd112c9e0e913ec734b304bf1:/lib/python/Components/Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 456fe026..562b2d0f 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -7,15 +7,28 @@ class Language:
 	def __init__(self):
 		gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
 		self.activeLanguage = 0
-		self.lang = []
+		self.lang = {}
+		self.langlist = []
 		# FIXME make list dynamically
-		self.addLanguage(_("English"), "en")
-		self.addLanguage(_("German"), "de")
-		self.addLanguage(_("Arabic"), "ar")
+		# name, iso-639 language, iso-3166 country. Please don't mix language&country!
+		self.addLanguage(_("English"), "en", "EN")
+		self.addLanguage(_("Arabic"), "ar", "AE")
+		self.addLanguage(_("Danish"), "da", "DK")
+		self.addLanguage(_("Dutch"), "nl", "NL")
+		self.addLanguage(_("French"), "fr", "FR")
+		self.addLanguage(_("German"), "de", "DE")
+		self.addLanguage(_("Icelandic"), "is", "IS")
+		self.addLanguage(_("Italian"), "it", "IT")
+		self.addLanguage(_("Norwegian"), "no", "NO")
+		self.addLanguage(_("Spanish"), "es", "ES")
+		self.addLanguage(_("Swedish"), "sv", "SE")
+		
+		self.callbacks = []
 
-	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[str(lang + "_" + country)] = ((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+			self.langlist.append(str(lang + "_" + country))
 		except:
 			print "Language " + str(name) + " not found"
 
@@ -24,13 +37,24 @@ class Language:
 			print "Activating language " + str(self.lang[index][0])
 			self.lang[index][1].install()
 			self.activeLanguage = index
+			for x in self.callbacks:
+				x()
 		except:
 			print "Selected language does not exist!"
-		
+
 	def getLanguageList(self):
 		list = []
-		for x in self.lang:
-			list.append(x[0])
+		for x in self.langlist:
+			list.append((x, self.lang[x]))
 		return list
-
+	
+	def getActiveLanguage(self):
+		return self.activeLanguage
+	
+	def getLanguage(self):
+		return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
+	
+	def addCallback(self, callback):
+		self.callbacks.append(callback)
+		
 language = Language()