X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/350ca9a9900a43be5873efdaf8e31f58dc4c3f9c..9f6a10b46af262567a5add9312927887c86531b8:/lib/python/Components/SetupDevices.py

diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
index 612bb8c8..9036fa63 100644
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -2,10 +2,11 @@
 from config import config				#global config instance
 from config import configElement
 from config import ConfigSubsection
-from config import ConfigSlider
+from config import configSlider
 from config import configSelection
 from config import configText
 from Components.Timezones import timezones
+from Components.Language import language
 
 def InitSetupDevices():
 	
@@ -17,25 +18,30 @@ def InitSetupDevices():
 	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") );
+	config.osd.alpha = configElement("config.osd.alpha", configSlider, 0, (1, 10));
+	config.osd.bright = configElement("config.osd.bright", configSlider, 5, (1, 10));
+	config.osd.contrast = configElement("config.osd.contrast", configSlider, 5, (1, 10));
+	
+	def languageNotifier(configElement):
+		language.activateLanguage(configElement.value)
+	
+	config.osd.language = configElement("config.osd.language", configText, "en_EN", 0);
+	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") );
+	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")) );