Изменён список предлагаемых --os при установке. Обновлён handbook.

master3.4 3.4.6.8
parent 09593fc440
commit 3a49f2f216

@ -32,11 +32,11 @@ pre {font-size:133% }
<ul>
<li>CLD - Calculate Linux Desktop KDE</li>
<li>CLDM - Calculate Linux Desktop MATE</li>
<li>CLDX - Calculate Linux Desktop XFCE</li>
<li>CLS - Calculate Linux Scratch</li>
<li>CMC - Calculate Media Center</li>
<li>CDS - Calculate Directory Server</li>
<li>CSS - Calculate Scratch Server</li>
<li>CLDX - Calculate Linux Desktop XFCE</li>
<li>CLS - Calculate Linux Scratch</li>
<li>CDS - Calculate Directory Server</li>
<li>CSS - Calculate Scratch Server</li>
<li>CMC - Calculate Media Center</li>
</ul>

@ -32,9 +32,9 @@ pre {font-size:133% }
<li>CLDM - Calculate Linux Desktop MATE</li>
<li>CLDX - Calculate Linux Desktop XFCE</li>
<li>CLS - Calculate Linux Scratch</li>
<li>CMC - Calculate Media Center</li>
<li>CDS - Calculate Directory Server</li>
<li>CSS - Calculate Scratch Server</li>
<li>CMC - Calculate Media Center</li>
</ul>

@ -413,15 +413,21 @@ class VariableClImageLinuxShortname(DistroRepository, Variable):
metavalue = "SYSTEM"
opt = ['--os', '-s']
def init(self):
self.label = "%s %s" % (_("Filter"), _("by distribution"))
self.help = _("select the operation system")
def choice(self):
return [("", _("Not used"))] + \
sorted(map(lambda x: (x, self.getFullNameByShort(x)),
self.dictLinuxName.keys()),
key=itemgetter(1))
return [("", _("Not used"))] + [
("CLD", "Calculate Linux Desktop KDE"),
("CLDM", "Calculate Linux Desktop MATE"),
("CLDX", "Calculate Linux Desktop XFCE"),
("CLS", "Calculate Linux Scratch"),
("CDS", "Calculate Directory Server"),
("CSS", "Calculate Scratch Server"),
("CMC", "Calculate Media Center"),
]
def humanReadable(self):
return self.Get() or _("Not used")

Loading…
Cancel
Save