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

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 0fb0aa0..a27f247 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,15 +11,22 @@ 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(_("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 = []
 
@@ -46,14 +52,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][2]) + "_" + str(self.lang[self.activeLanguage][3])
+		except:
+			return ''
+
 	def addCallback(self, callback):
 		self.callbacks.append(callback)
-		
+
 language = Language()