X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8433b73441c70e94a49f788529e90fe20aa27c15..5e942862b2017443ec34831f649f890f8215a534:/lib/python/Components/Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index d6810165..b5c7e18a 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,7 +1,6 @@
 import gettext
-import os
 
-from Tools.Directories import *
+from Tools.Directories import SCOPE_LANGUAGE, resolveFilename
 
 class Language:
 	def __init__(self):
@@ -12,29 +11,42 @@ class Language:
 		# FIXME make list dynamically
 		# 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(_("German"), "de", "DE")
+		self.addLanguage(_("Finnish"), "fi", "FI")
+		self.addLanguage(_("French"), "fr", "FR")
+		self.addLanguage(_("Greek"), "el", "GR")
+		self.addLanguage(_("Hungarian"), "hu", "HU")
+		self.addLanguage(_("Lithuanian"), "lt", "LT")
 		self.addLanguage(_("Icelandic"), "is", "IS")
 		self.addLanguage(_("Italian"), "it", "IT")
 		self.addLanguage(_("Norwegian"), "no", "NO")
+		self.addLanguage(_("Polish"), "pl", "PL")
+		self.addLanguage(_("Portuguese"), "pt", "PT")
+		self.addLanguage(_("Russian"), "ru", "RU")
 		self.addLanguage(_("Spanish"), "es", "ES")
 		self.addLanguage(_("Swedish"), "sv", "SE")
-		
+		self.addLanguage(_("Turkish"), "tr", "TR")
+
 		self.callbacks = []
 
 	def addLanguage(self, name, lang, country):
 		try:
-			self.lang[str(lang + "_" + country)] = ((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+			self.lang[str(lang + "_" + country)] = ((_(name), lang, country))
 			self.langlist.append(str(lang + "_" + country))
 		except:
 			print "Language " + str(name) + " not found"
 
 	def activateLanguage(self, index):
 		try:
-			print "Activating language " + str(self.lang[index][0])
-			self.lang[index][1].install()
+			lang = self.lang[index]
+			print "Activating language " + lang[0]
+			gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang[1]]).install()
 			self.activeLanguage = index
 			for x in self.callbacks:
 				x()
@@ -46,14 +58,17 @@ class Language:
 		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])
-	
+		try:
+			return str(self.lang[self.activeLanguage][1]) + "_" + str(self.lang[self.activeLanguage][2])
+		except:
+			return ''
+
 	def addCallback(self, callback):
 		self.callbacks.append(callback)
-		
+
 language = Language()