--- a/plcopen/plcopen.py Fri Jul 24 12:49:57 2009 +0200
+++ b/plcopen/plcopen.py Fri Jul 24 17:12:59 2009 +0200
@@ -253,7 +253,7 @@
def addconfiguration(self, name):
for configuration in self.instances.configurations.getconfiguration():
if configuration.getname() == name:
- raise ValueError, "\"%s\" configuration already exists !!!"%name
+ raise ValueError, _("\"%s\" configuration already exists !!!")%name
new_configuration = PLCOpenClasses["configurations_configuration"]()
new_configuration.setname(name)
self.instances.configurations.appendconfiguration(new_configuration)
@@ -267,7 +267,7 @@
found = True
break
if not found:
- raise ValueError, "\"%s\" configuration doesn't exist !!!"%name
+ raise ValueError, ("\"%s\" configuration doesn't exist !!!")%name
setattr(cls, "removeconfiguration", removeconfiguration)
def getconfigurationResource(self, config_name, name):
@@ -284,7 +284,7 @@
if configuration:
for resource in configuration.getresource():
if resource.getname() == name:
- raise ValueError, "\"%s\" resource already exists in \"%s\" configuration !!!"%(name, config_name)
+ raise ValueError, _("\"%s\" resource already exists in \"%s\" configuration !!!")%(name, config_name)
new_resource = PLCOpenClasses["configuration_resource"]()
new_resource.setname(name)
configuration.appendresource(new_resource)
@@ -300,7 +300,7 @@
found = True
break
if not found:
- raise ValueError, "\"%s\" resource doesn't exist in \"%s\" configuration !!!"%(name, config_name)
+ raise ValueError, _("\"%s\" resource doesn't exist in \"%s\" configuration !!!")%(name, config_name)
setattr(cls, "removeconfigurationResource", removeconfigurationResource)
def updateElementName(self, old_name, new_name):
@@ -779,7 +779,7 @@
found = True
break
if not found:
- raise ValueError, "\"%s\" Data Type doesn't exist !!!"%name
+ raise ValueError, _("\"%s\" Data Type doesn't exist !!!")%name
setattr(cls, "removedataTypeElement", removedataTypeElement)
def getpouElements(self):
@@ -797,7 +797,7 @@
def appendpouElement(self, name, pou_type, body_type):
for element in self.pous.getpou():
if element.getname() == name:
- raise ValueError, "\"%s\" POU already exists !!!"%name
+ raise ValueError, _("\"%s\" POU already exists !!!")%name
new_pou = PLCOpenClasses["pous_pou"]()
new_pou.setname(name)
new_pou.setpouType(pou_type)
@@ -818,7 +818,7 @@
found = True
break
if not found:
- raise ValueError, "\"%s\" POU doesn't exist !!!"%name
+ raise ValueError, _("\"%s\" POU doesn't exist !!!")%name
setattr(cls, "removepouElement", removepouElement)
cls = PLCOpenClasses.get("pous_pou", None)
@@ -1032,7 +1032,7 @@
removed = True
i += 1
if not removed:
- raise ValueError, "Transition with name %s doesn't exists!"%name
+ raise ValueError, _("Transition with name %s doesn't exists!")%name
setattr(cls, "removetransition", removetransition)
def addaction(self, name, type):
@@ -1070,7 +1070,7 @@
removed = True
i += 1
if not removed:
- raise ValueError, "Action with name %s doesn't exists!"%name
+ raise ValueError, _("Action with name %s doesn't exists!")%name
setattr(cls, "removeaction", removeaction)
def updateElementName(self, old_name, new_name):
@@ -1215,7 +1215,7 @@
PLCOpenClasses.get("commonObjects_continuation", None))):
element["value"].setexecutionOrderId(0)
else:
- raise TypeError, "Can only generate execution order on FBD networks!"
+ raise TypeError, _("Can only generate execution order on FBD networks!")
setattr(cls, "resetexecutionOrder", resetexecutionOrder)
def compileexecutionOrder(self):
@@ -1229,7 +1229,7 @@
self.compileelementExecutionOrder(connections[0])
element["value"].setexecutionOrderId(self.getnewExecutionOrderId())
else:
- raise TypeError, "Can only generate execution order on FBD networks!"
+ raise TypeError, _("Can only generate execution order on FBD networks!")
setattr(cls, "compileexecutionOrder", compileexecutionOrder)
def compileelementExecutionOrder(self, link):
@@ -1250,7 +1250,7 @@
if connections and len(connections) == 1:
self.compileelementExecutionOrder(connections[0])
else:
- raise TypeError, "Can only generate execution order on FBD networks!"
+ raise TypeError, _("Can only generate execution order on FBD networks!")
setattr(cls, "compileelementExecutionOrder", compileelementExecutionOrder)
def setelementExecutionOrder(self, instance, new_executionOrder):
@@ -1266,14 +1266,14 @@
element["value"].setexecutionOrderId(element_executionOrder + 1)
instance.setexecutionOrderId(new_executionOrder)
else:
- raise TypeError, "Can only generate execution order on FBD networks!"
+ raise TypeError, _("Can only generate execution order on FBD networks!")
setattr(cls, "setelementExecutionOrder", setelementExecutionOrder)
def appendcontentInstance(self, name, instance):
if self.content["name"] in ["LD","FBD","SFC"]:
self.content["value"].appendcontent({"name" : name, "value" : instance})
else:
- raise TypeError, "%s body don't have instances!"%self.content["name"]
+ raise TypeError, _("%s body don't have instances!")%self.content["name"]
setattr(cls, "appendcontentInstance", appendcontentInstance)
def getcontentInstances(self):
@@ -1283,7 +1283,7 @@
instances.append(element["value"])
return instances
else:
- raise TypeError, "%s body don't have instances!"%self.content["name"]
+ raise TypeError, _("%s body don't have instances!")%self.content["name"]
setattr(cls, "getcontentInstances", getcontentInstances)
def getcontentInstance(self, id):
@@ -1293,7 +1293,7 @@
return element["value"]
return None
else:
- raise TypeError, "%s body don't have instances!"%self.content["name"]
+ raise TypeError, _("%s body don't have instances!")%self.content["name"]
setattr(cls, "getcontentInstance", getcontentInstance)
def getcontentRandomInstance(self, exclude):
@@ -1303,7 +1303,7 @@
return element["value"]
return None
else:
- raise TypeError, "%s body don't have instances!"%self.content["name"]
+ raise TypeError, _("%s body don't have instances!")%self.content["name"]
setattr(cls, "getcontentRandomInstance", getcontentRandomInstance)
def getcontentInstanceByName(self, name):
@@ -1312,7 +1312,7 @@
if isinstance(element["value"], PLCOpenClasses.get("fbdObjects_block", None)) and element["value"].getinstanceName() == name:
return element["value"]
else:
- raise TypeError, "%s body don't have instances!"%self.content["name"]
+ raise TypeError, _("%s body don't have instances!")%self.content["name"]
setattr(cls, "getcontentInstanceByName", getcontentInstanceByName)
def removecontentInstance(self, id):
@@ -1326,7 +1326,7 @@
removed = True
i += 1
if not removed:
- raise ValueError, "Instance with id %d doesn't exists!"%id
+ raise ValueError, _("Instance with id %d doesn't exists!")%id
else:
raise TypeError, "%s body don't have instances!"%self.content["name"]
setattr(cls, "removecontentInstance", removecontentInstance)
@@ -1335,14 +1335,14 @@
if self.content["name"] in ["IL","ST"]:
self.content["value"].settext(text)
else:
- raise TypeError, "%s body don't have text!"%self.content["name"]
+ raise TypeError, _("%s body don't have text!")%self.content["name"]
setattr(cls, "settext", settext)
def gettext(self):
if self.content["name"] in ["IL","ST"]:
return self.content["value"].gettext()
else:
- raise TypeError, "%s body don't have text!"%self.content["name"]
+ raise TypeError, _("%s body don't have text!")%self.content["name"]
setattr(cls, "gettext", gettext)
def updateElementName(self, old_name, new_name):
@@ -2117,7 +2117,7 @@
elif opened == closed:
i += 1
else:
- raise ValueError, "\"%s\" is an invalid value!"%value
+ raise ValueError, _("\"%s\" is an invalid value!")%value
return items
cls = PLCOpenClasses.get("value_arrayValue", None)