--- a/ConfigTreeNode.py Sun Jul 30 13:54:51 2017 -0700
+++ b/ConfigTreeNode.py Mon Aug 07 14:28:29 2017 +0300
@@ -53,7 +53,7 @@
</xsd:schema>""")
NameTypeSeparator = '@'
-XSDSchemaErrorMessage = _("{a1} XML file doesn't follow XSD schema at line %{a2}:\n{a3}")
+XSDSchemaErrorMessage = _("{a1} XML file doesn't follow XSD schema at line {a2}:\n{a3}")
class ConfigTreeNode:
"""
--- a/ProjectController.py Sun Jul 30 13:54:51 2017 -0700
+++ b/ProjectController.py Mon Aug 07 14:28:29 2017 +0300
@@ -899,7 +899,7 @@
for line in ListGroup[0]:
# Split and Maps each field to dictionnary entries
attrs = dict(zip(ProgramsListAttributeName,line.strip().split(';')))
- # Truncate "C_path" to remove conf an ressources names
+ # Truncate "C_path" to remove conf an resources names
attrs["C_path"] = '__'.join(attrs["C_path"].split(".",2)[1:])
# Push this dictionnary into result.
self._ProgramList.append(attrs)
@@ -910,7 +910,7 @@
for line in ListGroup[1]:
# Split and Maps each field to dictionnary entries
attrs = dict(zip(VariablesListAttributeName,line.strip().split(';')))
- # Truncate "C_path" to remove conf an ressources names
+ # Truncate "C_path" to remove conf an resources names
parts = attrs["C_path"].split(".",2)
if len(parts) > 2:
config_FB = config_FBs.get(tuple(parts[:2]))
--- a/canfestival/config_utils.py Sun Jul 30 13:54:51 2017 -0700
+++ b/canfestival/config_utils.py Mon Aug 07 14:28:29 2017 +0300
@@ -378,7 +378,7 @@
numbit = None
if location["IEC_TYPE"] != "BOOL" and subentry_infos["type"] != COlocationtype:
- raise PDOmappingException, _("Invalid type \"{a1}\"-> {a2} != {a3} for location\"{a4}\"").\
+ raise PDOmappingException, _("Invalid type \"{a1}\"-> {a2} != {a3} for location \"{a4}\"").\
format(a1 = location["IEC_TYPE"], a2 = COlocationtype, a3 = subentry_infos["type"] , a4 = name)
typeinfos = node.GetEntryInfos(COlocationtype)
--- a/plcopen/Standard_Function_Blocks.xml Sun Jul 30 13:54:51 2017 -0700
+++ b/plcopen/Standard_Function_Blocks.xml Mon Aug 07 14:28:29 2017 +0300
@@ -115,7 +115,7 @@
</ST>
</body>
<documentation>
- <xhtml:p><![CDATA[The semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources.]]></xhtml:p>
+ <xhtml:p><![CDATA[The semaphore provides a mechanism to allow software elements mutually exclusive access to certain resources.]]></xhtml:p>
</documentation>
</pou>
<pou name="R_TRIG" pouType="functionBlock">