X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fe798a5d31319171dbb76c6d9fec268e691d3f77..f097c3b368c10b7c88f63038459c4c5a38889a1f:/lib/python/Components/Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index bd188e58..07697715 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,17 +1,24 @@
 import gettext
 import os
 
+from Tools.Directories import *
+
 class Language:
 	def __init__(self):
-		gettext.install('enigma2', '/enigma2/po')
+		gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
+		self.activeLanguage = 0
 		self.lang = []
 		# 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(_("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', '/enigma2/po', languages=[lang]), lang))
+			self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
 		except:
 			print "Language " + str(name) + " not found"
 
@@ -19,6 +26,7 @@ class Language:
 		try:
 			print "Activating language " + str(self.lang[index][0])
 			self.lang[index][1].install()
+			self.activeLanguage = index
 		except:
 			print "Selected language does not exist!"