X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FLanguage.py;h=a27f247ed5cdfbda51ffefeefb2170850b54c779;hp=0e7847a7f141fc6d151fa03228e7457398925147;hb=ed40f6f85c9c07c3c1224ae20601082c0309a631;hpb=c70d4282351bbe4cd09f07a246221e22652783a2

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 0e7847a..a27f247 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,19 +1,39 @@
 import gettext
-import os
 
-from Tools.Directories import *
+from Tools.Directories import SCOPE_LANGUAGE, resolveFilename
 
 class Language:
 	def __init__(self):
-		gettext.install('enigma2', '/enigma2/po')
-		self.lang = []
+		gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
+		self.activeLanguage = 0
+		self.lang = {}
+		self.langlist = []
 		# FIXME make list dynamically
-		self.addLanguage(_("English"), "en")
-		self.addLanguage(_("German"), "de")
+		# 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(_("Catalan"), "ca", "AD")
+		self.addLanguage(_("Croatian"), "hr", "HR")
+		self.addLanguage(_("Czech"), "cs", "CZ")
+		self.addLanguage(_("Danish"), "da", "DK")
+		self.addLanguage(_("Dutch"), "nl", "NL")
+		self.addLanguage(_("Finnish"), "fi", "FI")
+		self.addLanguage(_("French"), "fr", "FR")
+		self.addLanguage(_("Hungarian"), "hu", "HU")
+		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.addLanguage(_("Turkish"), "tr", "TR")
+		
+		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"
 
@@ -21,13 +41,28 @@ class Language:
 		try:
 			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):
+		try:
+			return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
+		except:
+			return ''
+
+	def addCallback(self, callback):
+		self.callbacks.append(callback)
+
 language = Language()