diff -r 0bb82be64630 -r 2ae92a99ac10 objdictgen/nodelist.py --- a/objdictgen/nodelist.py Mon Jul 20 16:11:20 2009 +0200 +++ b/objdictgen/nodelist.py Mon Jul 27 16:29:59 2009 +0200 @@ -96,7 +96,7 @@ self.Root = root if not os.path.exists(self.Root): - return "\"%s\" folder doesn't exist"%self.Root + return _("\"%s\" folder doesn't exist")%self.Root self.EDSFolder = os.path.join(self.Root, "eds") if not os.path.exists(self.EDSFolder): @@ -134,7 +134,7 @@ dir, file = os.path.split(edspath) eds = os.path.join(self.EDSFolder, file) if not force and os.path.isfile(eds): - return "EDS file already imported" + return _("EDS file already imported") else: shutil.copy(edspath, self.EDSFolder) return self.LoadEDS(file) @@ -155,14 +155,14 @@ self.Changed = True return None else: - return "\"%s\" EDS file is not available"%eds + return _("\"%s\" EDS file is not available")%eds def RemoveSlaveNode(self, index): if index in self.SlaveNodes.keys(): self.SlaveNodes.pop(index) return None else: - return "Node with \"0x%2.2X\" ID doesn't exist" + return _("Node with \"0x%2.2X\" ID doesn't exist") def LoadMasterNode(self, netname = None): if netname: @@ -185,7 +185,7 @@ if self.Manager.SaveCurrentInFile(masterpath): return None else: - return "Fail to save Master Node" + return _("Fail to save Master Node") def LoadSlaveNodes(self, netname = None): cpjpath = os.path.join(self.Root, "nodelist.cpj") @@ -209,7 +209,7 @@ return result self.Changed = False except SyntaxError, message: - return "Unable to load CPJ file\n%s"%message + return _("Unable to load CPJ file\n%s")%message return None def SaveNodeList(self, netname = None): @@ -225,14 +225,14 @@ self.Changed = False return None except: - return "Fail to save node list" + return _("Fail to save node list") def GetSlaveNodeEntry(self, nodeid, index, subindex = None): if nodeid in self.SlaveNodes.keys(): self.SlaveNodes[nodeid]["Node"].SetNodeID(nodeid) return self.SlaveNodes[nodeid]["Node"].GetEntry(index, subindex) else: - return "Node 0x%2.2X doesn't exist"%nodeid + return _("Node 0x%2.2X doesn't exist")%nodeid def GetMasterNodeEntry(self, index, subindex = None): return self.Manager.GetCurrentEntry(index, subindex) @@ -300,7 +300,7 @@ validindexes.append((node.GetEntryName(index), index)) return validindexes else: - print "Can't find node" + print _("Can't find node") return [] def GetCurrentEntryValues(self, index): @@ -310,7 +310,7 @@ node.SetNodeID(self.CurrentSelected) return self.Manager.GetNodeEntryValues(node, index) else: - print "Can't find node" + print _("Can't find node") return [], [] def AddToMasterDCF(self, node_id, index, subindex, size, value):