diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-22 23:41:16 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-22 23:41:16 +0000 |
| commit | 2b72cfe222c5c013e9a10372c826ae5b3f56ef33 (patch) | |
| tree | fea923b608c010f72f1671448d915ca10f281df2 /lib/python | |
| parent | 7fcee9d52e615789975fd049a6c5d5eb5a34faa2 (diff) | |
| download | enigma2-2b72cfe222c5c013e9a10372c826ae5b3f56ef33.tar.gz enigma2-2b72cfe222c5c013e9a10372c826ae5b3f56ef33.zip | |
translations
fix ScanSetup when there is a non-dvb-s-nim in slot a and dvb-s in slot b
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/Lcd.py | 2 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py index 42f15698..b9ba5606 100644 --- a/lib/python/Components/Lcd.py +++ b/lib/python/Components/Lcd.py @@ -29,7 +29,7 @@ def InitLcd(): config.lcd.bright = configElement("config.lcd.bright", ConfigSlider, 10, ""); config.lcd.contrast = configElement("config.lcd.contrast", ConfigSlider, 10, ""); config.lcd.standby = configElement("config.lcd.standby", ConfigSlider, 0, ""); - config.lcd.invert = configElement("config.lcd.invert", configSelection, 0, ("Disable", "Enable") ); + config.lcd.invert = configElement("config.lcd.invert", configSelection, 0, (_("Disable"), _("Enable")) ); ilcd = LCD() diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index fd805e45..f677f5c8 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -63,10 +63,14 @@ class ScanSetup(Screen): for slot in nimmanager.nimslots: if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]): self.satList.append(nimmanager.getSatListForNim(slot.slotid)) - + else: + self.satList.append(None) + def createSetup(self): self.list = [] + print "ID: " + str(config.scan.nims.value) + self.list.append(getConfigListEntry(_("Tuner"), config.scan.nims)) if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]): @@ -83,12 +87,12 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_('Frequency'), config.scan.sat.frequency)) self.list.append(getConfigListEntry(_('Inversion'), config.scan.sat.inversion)) self.list.append(getConfigListEntry(_('Symbolrate'), config.scan.sat.symbolrate)) - self.list.append(getConfigListEntry("Polarity", config.scan.sat.polarization)) - self.list.append(getConfigListEntry("FEC", config.scan.sat.fec)) + self.list.append(getConfigListEntry(_("Polarity"), config.scan.sat.polarization)) + self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec)) if (config.scan.type.value == 1): # single satellite scan self.updateSatList() print config.scan.satselection[config.scan.nims.value] - self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) + self.list.append(getConfigListEntry(_("Satellite"), config.scan.satselection[config.scan.nims.value])) if (config.scan.type.value == 2): # multi sat scan # if (norotor) tlist = [] @@ -97,7 +101,7 @@ class ScanSetup(Screen): for x in SatList: if self.Satexists(tlist, x[1]) == 0: tlist.append(x[1]) - sat = configElement_nonSave(x[1], configSelection, 0, ("Enable", "Disable")) + sat = configElement_nonSave(x[1], configSelection, 0, (_("Enable"), "Disable")) self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat)) # if (rotor): @@ -199,8 +203,10 @@ class ScanSetup(Screen): slotid = 0 for slot in nimmanager.nimslots: if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]): + print str(slot.slotid) + " : " + str(self.satList) config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid])) - + else: + config.scan.satselection.append(None) def keyLeft(self): self["config"].handleKey(config.key["prevElement"]) self.newConfig() @@ -355,9 +361,9 @@ class ScanSimple(Screen): for x in SatList: if self.Satexists(tlist, x) == 0: tlist.append(x) - sat = configElement_nonSave(x, configSelection, 0, ("Enable", "Disable")) + sat = configElement_nonSave(x, configSelection, 0, (_("Enable"), _("Disable"))) self.list.append(getConfigListEntry(nimmanager.getSatDescription(x), sat)) self["config"] = ConfigList(self.list) - self["header"] = Label("Automatic Scan") - self["footer"] = Label("Press OK to scan") + self["header"] = Label(_("Automatic Scan")) + self["footer"] = Label(_("Press OK to scan")) |