From c7d64db5b5ba86154227772053933c3391e95674 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Mon, 12 Feb 2018 10:25:23 -0500 Subject: [PATCH] Arch: Misc. typos and uniformity fixes --- src/Mod/Arch/ArchCommands.py | 12 ++++++------ src/Mod/Arch/ArchStructure.py | 12 ++++++------ src/Mod/Arch/ArchWall.py | 2 +- src/Mod/Arch/ArchWindow.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index d9c6231d15..b87bde54a5 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -1128,8 +1128,8 @@ def cleanArchSplitter(objects=None): def rebuildArchShape(objects=None): - """rebuildArchShape([objects]): takes the faces from the base shape of the given ( - or selected if objects is None) Arch objects, and tries to rebuild a valid solid from them.""" + """rebuildArchShape([objects]): takes the faces from the base shape of the given (or selected + if objects is None) Arch objects, and tries to rebuild a valid solid from them.""" import FreeCAD,FreeCADGui,Part if not objects: objects = FreeCADGui.Selection.getSelection() @@ -1430,7 +1430,7 @@ class _CommandCheck: def Activated(self): result = check(FreeCADGui.Selection.getSelection()) if not result: - FreeCAD.Console.PrintMessage(str(translate("Arch","All good! no problems found"))) + FreeCAD.Console.PrintMessage(str(translate("Arch","All good! No problems found"))) else: FreeCADGui.Selection.clearSelection() for i in result: @@ -1443,7 +1443,7 @@ class _CommandIfcExplorer: def GetResources(self): return {'Pixmap' : 'IFC', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_IfcExplorer","Ifc Explorer"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Check","Explore the contents of an Ifc file")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Check","Explore the contents of an IFC file")} def Activated(self): if hasattr(self,"dialog"): @@ -1552,7 +1552,7 @@ def makeIfcSpreadsheet(archobj=None): archobj.IfcProperties = ifc_spreadsheet return ifc_spreadsheet else : - FreeCAD.Console.PrintWarning(translate("Arch", "The object have not IfcProperties attribute. Cancel spreadsheet creation for object : ") + archobj.Label) + FreeCAD.Console.PrintWarning(translate("Arch", "The object doesn't have an IfcProperties attribute. Cancel spreadsheet creation for object:")+ ' ' + archobj.Label) FreeCAD.ActiveDocument.removeObject(ifc_spreadsheet) else : return ifc_spreadsheet @@ -1563,7 +1563,7 @@ class _CommandIfcSpreadsheet: return {'Pixmap': 'Arch_Schedule', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Create IFC spreadsheet..."), 'Accel': "I, P", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Creates a spreadsheet to store ifc properties of an object.")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Creates a spreadsheet to store IFC properties of an object.")} def IsActive(self): return not FreeCAD.ActiveDocument is None diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index 5ffa354907..1a442dff2a 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -779,15 +779,15 @@ class StructureTaskPanel(ArchComponent.ComponentTaskPanel): if not other: self.observer = StructSelectionObserver(self.extendNodes) FreeCADGui.Selection.addObserver(self.observer) - FreeCAD.Console.PrintMessage(translate("Arch","Pick another Structure object: ")) + FreeCAD.Console.PrintMessage(translate("Arch","Choose another Structure object:")) else: FreeCADGui.Selection.removeObserver(self.observer) self.observer = None if Draft.getType(other) != "Structure": - FreeCAD.Console.PrintError(translate("Arch","The picked object is not a Structure")+"\n") + FreeCAD.Console.PrintError(translate("Arch","The chosen object is not a Structure")+"\n") else: if not other.Nodes: - FreeCAD.Console.PrintError(translate("Arch","The picked object has no structural nodes")+"\n") + FreeCAD.Console.PrintError(translate("Arch","The chosen object has no structural nodes")+"\n") else: if (len(self.Object.Nodes) != 2) or (len(other.Nodes) != 2): FreeCAD.Console.PrintError(translate("Arch","One of these objects has more than 2 nodes")+"\n") @@ -810,15 +810,15 @@ class StructureTaskPanel(ArchComponent.ComponentTaskPanel): if not other: self.observer = StructSelectionObserver(self.connectNodes) FreeCADGui.Selection.addObserver(self.observer) - FreeCAD.Console.PrintMessage(translate("Arch","Pick another Structure object: ")) + FreeCAD.Console.PrintMessage(translate("Arch","Choose another Structure object:")) else: FreeCADGui.Selection.removeObserver(self.observer) self.observer = None if Draft.getType(other) != "Structure": - FreeCAD.Console.PrintError(translate("Arch","The picked object is not a Structure")+"\n") + FreeCAD.Console.PrintError(translate("Arch","The chosen object is not a Structure")+"\n") else: if not other.Nodes: - FreeCAD.Console.PrintError(translate("Arch","The picked object has no structural nodes")+"\n") + FreeCAD.Console.PrintError(translate("Arch","The chosen object has no structural nodes")+"\n") else: if (len(self.Object.Nodes) != 2) or (len(other.Nodes) != 2): FreeCAD.Console.PrintError(translate("Arch","One of these objects has more than 2 nodes")+"\n") diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py index 7cd8975ef5..457b78b11a 100644 --- a/src/Mod/Arch/ArchWall.py +++ b/src/Mod/Arch/ArchWall.py @@ -436,7 +436,7 @@ class _CommandMergeWalls: FreeCAD.ActiveDocument.commitTransaction() return else: - FreeCAD.Console.PrintWarning(str(translate("Arch","The selected wall contain no subwall to merge"))) + FreeCAD.Console.PrintWarning(str(translate("Arch","The selected wall contains no subwall to merge"))) return else: FreeCAD.Console.PrintWarning(str(translate("Arch","Please select only wall objects"))) diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py index a405c0c93c..d70e2eb1f6 100644 --- a/src/Mod/Arch/ArchWindow.py +++ b/src/Mod/Arch/ArchWindow.py @@ -458,7 +458,7 @@ class _CommandWindow: self.tracker.width(self.Thickness) self.tracker.height(self.Height) self.tracker.on() - FreeCAD.Console.PrintMessage(translate("Arch","Pick a face on an existing object or select a preset")+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Choose a face on an existing object or select a preset")+"\n") FreeCADGui.Snapper.getPoint(callback=self.getPoint,movecallback=self.update,extradlg=self.taskbox()) #FreeCADGui.Snapper.setSelectMode(True)