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

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 8d966b68..d6e43a5d 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,9 +1,12 @@
 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")
@@ -11,13 +14,17 @@ class Language:
 
 	def addLanguage(self, name, lang):
 		try:
-			self.lang.append((_(name), gettext.translation('enigma2', '/enigma2/po', languages=[lang])))
+			self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang))
 		except:
 			print "Language " + str(name) + " not found"
 
 	def activateLanguage(self, index):
-		print "Activating language " + str(self.lang[index][0])
-		self.lang[index][1].install()
+		try:
+			print "Activating language " + str(self.lang[index][0])
+			self.lang[index][1].install()
+			self.activeLanguage = index
+		except:
+			print "Selected language does not exist!"
 		
 	def getLanguageList(self):
 		list = []
@@ -25,4 +32,4 @@ class Language:
 			list.append(x[0])
 		return list
 
-language = Language()
\ No newline at end of file
+language = Language()