X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FLanguage.py;h=e95c6dfbcf1db136ec2f2600bbf2a7eec3ae0c7e;hp=74dd67d85d03d5c93558f31d4d861bf4d1c024de;hb=a9984df92fc78bd4955b24502724b74b935dcc3f;hpb=d58ca4cf34b7621aea4e2c1ff07bed6b2cd6b763

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 74dd67d..e95c6df 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -21,6 +21,7 @@ class Language:
 		self.addLanguage(_("Czech"), "cs", "CZ")
 		self.addLanguage(_("Danish"), "da", "DK")
 		self.addLanguage(_("Dutch"), "nl", "NL")
+		self.addLanguage(_("Estonian"), "et", "EE")
 		self.addLanguage(_("Finnish"), "fi", "FI")
 		self.addLanguage(_("French"), "fr", "FR")
 		self.addLanguage(_("Greek"), "el", "GR")
@@ -33,6 +34,9 @@ class Language:
 		self.addLanguage(_("Polish"), "pl", "PL")
 		self.addLanguage(_("Portuguese"), "pt", "PT")
 		self.addLanguage(_("Russian"), "ru", "RU")
+		self.addLanguage(_("Serbian"), "sr", "YU")
+		self.addLanguage(_("Slovakian"), "sk", "SK")
+		self.addLanguage(_("Slovenian"), "sl", "SI")
 		self.addLanguage(_("Spanish"), "es", "ES")
 		self.addLanguage(_("Swedish"), "sv", "SE")
 		self.addLanguage(_("Turkish"), "tr", "TR")
@@ -64,18 +68,17 @@ class Language:
 			self.activateLanguage(self.langlist[index])
 
 	def getLanguageList(self):
-		list = []
-		for x in self.langlist:
-			list.append((x, self.lang[x]))
-		return list
+		return [ (x, self.lang[x]) for x in self.langlist ]
 
 	def getActiveLanguage(self):
 		return self.activeLanguage
 	
 	def getActiveLanguageIndex(self):
-		for count in range(len(self.langlist)):
-			if self.langlist[count] == self.activeLanguage:
-				return count
+		idx = 0
+		for x in self.langlist:
+			if x == self.activeLanguage:
+				return idx
+			idx += 1
 		return None			
 
 	def getLanguage(self):