Fix translate

master3.3 3.1.3
Mike Hiretsky 11 years ago
parent f550a523a5
commit 3b001c6b34

@ -3073,21 +3073,23 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
def funcExit(self,funArgv, resS, localVars, textTemplateTmp, nameTemp):
"""
Вывод сообщения с ошибкой
Good exit
"""
# TODO: need remove
return textTemplateTmp
self.printSUCCESS(_(funArgv))
raise TemplatesInterrupt(_("Applying was stop"),TemplatesInterrupt.EXIT)
raise TemplatesInterrupt(_("Execution of templates was stopped"),
TemplatesInterrupt.EXIT)
def funcBreak(self,funArgv, resS, localVars, textTemplateTmp, nameTemp):
"""
Вывод сообщения с ошибкой
Bad exit
"""
# TODO: need remove
return textTemplateTmp
self.printERROR(_(funArgv))
raise TemplatesInterrupt(_("Applying was interrupted"),
raise TemplatesInterrupt(_("Execution of templates was "
"interrupted with the error"),
TemplatesInterrupt.ABORT)
def getElogTimestamp(self):

@ -195,10 +195,6 @@ class VariableClAutoupdateSet(Variable):
"""
type = 'bool'
def init(self):
self.help = _("replace protected configs")
self.label = _("Replace protected configs")
def get(self):
if self.Get('cl_dispatch_conf') == 'usenew':
print "ON"
@ -219,14 +215,14 @@ class VariableClDispatchConf(Variable):
def init(self):
self.help = "'usenew' - " +_("use new config files") +\
",\n'skip' - " + _("skip config files dispatching") +\
",\n'dispatch' - " + _("dispatch config files")
",\n'skip' - " + _("skip the update config files") +\
",\n'dispatch' - " + _("manually update config files")
self.label = _("Update config files method")
def choice(self):
return [("usenew",_("Use new config files")),
("skip",_("Skip config files dispatching")),
("dispatch",_("Manual config files dispatching"))]
("skip",_("Skip the update config files")),
("dispatch",_("Manually update config files"))]
class VariableClWsdl(Variable):
"""

Loading…
Cancel
Save