X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eaf7dc217cb2f3ec7036f5442d0096d0aacd13db..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/SetupDevices.py?ds=sidebyside

diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
index 3161f125..2c5990a9 100644
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -5,39 +5,43 @@ from config import ConfigSubsection
 from config import ConfigSlider
 from config import configSelection
 from config import configText
+from Components.Timezones import timezones
+from Components.Language import language
 
 def InitSetupDevices():
+	
+	def timezoneNotifier(configElement):
+		timezones.activateTimezone(configElement.value)
+		
 	config.timezone = ConfigSubsection();
-	config.timezone.val = configElement("config.timezone.val", configSelection, 1, ("GMT", "GMT+1", "GMT+2", "GMT+3", "GMT+4", "GMT+5", "GMT+6", "GMT+7", "GMT+8", "GMT+9") );
+	config.timezone.val = configElement("config.timezone.val", configSelection, timezones.getDefaultTimezone(), timezones.getTimezoneList());
+	config.timezone.val.addNotifier(timezoneNotifier)
 
 	config.rc = ConfigSubsection();
-	config.rc.map = configElement("config.rc.map", configSelection, 0, ("Default", "Classic") );
+	config.rc.map = configElement("config.rc.map", configSelection, 0, (_("Default"), _("Classic")) );
 
 	config.keyboard = ConfigSubsection();
-	config.keyboard.keymap = configElement("config.keyboard.keymap", configSelection, 1, ("English", "German") );
+	config.keyboard.keymap = configElement("config.keyboard.keymap", configSelection, 1, (_("English"), _("German")) );
 
 	config.osd = ConfigSubsection();
 	config.osd.alpha = configElement("config.osd.alpha", ConfigSlider, 0, "");
 	config.osd.bright = configElement("config.osd.bright", ConfigSlider, 5, "");
 	config.osd.contrast = configElement("config.osd.contrast", ConfigSlider, 5, "");
-	config.osd.language = configElement("config.osd.language", configSelection, 0, ("English", "English US") );
+	
+	def languageNotifier(configElement):
+		language.activateLanguage(configElement.value)
+	
+	config.osd.language = configElement("config.osd.language", configSelection, 0, language.getLanguageList() );
+	config.osd.language.addNotifier(languageNotifier)
 
 	config.parental = ConfigSubsection();
-	config.parental.lock = configElement("config.parental.lock", configSelection, 1, ("Enable", "Disable") );
-	config.parental.setuplock = configElement("config.parental.setuplock", configSelection, 1, ("Enable", "Disable") );
+	config.parental.lock = configElement("config.parental.lock", configSelection, 1, (_("Enable"), _("Disable")) );
+	config.parental.setuplock = configElement("config.parental.setuplock", configSelection, 1, (_("Enable"), _("Disable")) );
 
 	config.expert = ConfigSubsection();
 	config.expert.splitsize = configElement("config.expert.splitsize", configSelection, 1, ("0.5Gbyte", "1.0 GByte", "1.5 GByte", "2.0 GByte") );
-	config.expert.satpos = configElement("config.expert.satpos", configSelection, 1, ("Enable", "Disable") );
-	config.expert.fastzap = configElement("config.expert.fastzap", configSelection, 0, ("Enable", "Disable") );
-	config.expert.skipconfirm = configElement("config.expert.skipconfirm", configSelection, 1, ("Enable", "Disable") );
-	config.expert.hideerrors = configElement("config.expert.hideerrors", configSelection, 1, ("Enable", "Disable") );
-	config.expert.autoinfo = configElement("config.expert.autoinfo", configSelection, 1, ("Enable", "Disable") );
-
-	#here?
-	config.tv = ConfigSubsection();
-	config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
-	
-	config.tv.lastservice.value = "blasel"
-	config.tv.lastservice.save()
-
+	config.expert.satpos = configElement("config.expert.satpos", configSelection, 1, (_("Enable"), _("Disable")) );
+	config.expert.fastzap = configElement("config.expert.fastzap", configSelection, 0, (_("Enable"), _("Disable")) );
+	config.expert.skipconfirm = configElement("config.expert.skipconfirm", configSelection, 1, (_("Enable"), _("Disable")) );
+	config.expert.hideerrors = configElement("config.expert.hideerrors", configSelection, 1, (_("Enable"), _("Disable")) );
+	config.expert.autoinfo = configElement("config.expert.autoinfo", configSelection, 1, (_("Enable"), _("Disable")) );