From f7c50a4d758065bd973795899adbc8ab1580451e Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 23 Feb 2021 18:59:04 -0600 Subject: [PATCH 1/6] fix string formatting --- src/Mod/Path/PathScripts/PathDeburr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathDeburr.py b/src/Mod/Path/PathScripts/PathDeburr.py index ba530dc366..a6c24241f4 100644 --- a/src/Mod/Path/PathScripts/PathDeburr.py +++ b/src/Mod/Path/PathScripts/PathDeburr.py @@ -70,7 +70,7 @@ def toolDepthAndOffset(width, extraDepth, tool, printInfo): else: toolOffset = 0.0 if printInfo and not suppressInfo: - FreeCAD.Console.PrintMessage(translate('PathDeburr', "The selected tool has no FlatRadius and no TipDiameter property. Assuming {}\n").format("Endmill" if angle == 180 else "V-Bit")) + FreeCAD.Console.PrintMessage(translate('PathDeburr', "The selected tool has no FlatRadius and no TipDiameter property. Assuming {}\n".format("Endmill" if angle == 180 else "V-Bit"))) suppressInfo = True else: angle = 180 From 85bd1bf6399760afddb9d8ae270d613a6a64c1b7 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 23 Feb 2021 19:01:29 -0600 Subject: [PATCH 2/6] typo in string --- src/Mod/Path/PathScripts/PathThreadMilling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathThreadMilling.py b/src/Mod/Path/PathScripts/PathThreadMilling.py index 7b15afbc36..1b2edb65b1 100644 --- a/src/Mod/Path/PathScripts/PathThreadMilling.py +++ b/src/Mod/Path/PathScripts/PathThreadMilling.py @@ -183,7 +183,7 @@ class ObjectThreadMilling(PathCircularHoleBase.ObjectOp): obj.ThreadOrientation = self.ThreadOrientations obj.addProperty("App::PropertyEnumeration", "ThreadType", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Currently only internal")) obj.ThreadType = self.ThreadTypes - obj.addProperty("App::PropertyString", "ThreadName", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Devfines which standard thread was chosen")) + obj.addProperty("App::PropertyString", "ThreadName", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Defines which standard thread was chosen")) obj.addProperty("App::PropertyLength", "MajorDiameter", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's major diameter")) obj.addProperty("App::PropertyLength", "MinorDiameter", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's minor diameter")) obj.addProperty("App::PropertyLength", "Pitch", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's pitch - used for metric threads")) From b2283c543022ae4f596b04955c8777b380b54175 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 23 Feb 2021 19:03:18 -0600 Subject: [PATCH 3/6] Make string less ambiguous --- src/Mod/Path/PathScripts/PathThreadMilling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathThreadMilling.py b/src/Mod/Path/PathScripts/PathThreadMilling.py index 1b2edb65b1..4aa45480d4 100644 --- a/src/Mod/Path/PathScripts/PathThreadMilling.py +++ b/src/Mod/Path/PathScripts/PathThreadMilling.py @@ -187,7 +187,7 @@ class ObjectThreadMilling(PathCircularHoleBase.ObjectOp): obj.addProperty("App::PropertyLength", "MajorDiameter", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's major diameter")) obj.addProperty("App::PropertyLength", "MinorDiameter", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's minor diameter")) obj.addProperty("App::PropertyLength", "Pitch", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's pitch - used for metric threads")) - obj.addProperty("App::PropertyInteger", "TPI", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's tpi - used for imperial threads")) + obj.addProperty("App::PropertyInteger", "TPI", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set thread's TPI (turns per inch) - used for imperial threads")) obj.addProperty("App::PropertyInteger", "ThreadFit", "Thread", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set how many passes are used to cut the thread")) obj.addProperty("App::PropertyInteger", "Passes", "Operation", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Set how many passes are used to cut the thread")) obj.addProperty("App::PropertyEnumeration", "Direction", "Operation", QtCore.QT_TRANSLATE_NOOP("PathThreadMilling", "Direction of thread cutting operation")) From 315d4a8026efe6d266d8bbb7b405f6385691fbff Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 23 Feb 2021 19:06:08 -0600 Subject: [PATCH 4/6] fix bad string formatting --- src/Mod/Path/PathScripts/PathToolBit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathToolBit.py b/src/Mod/Path/PathScripts/PathToolBit.py index 3e02f8c253..44da128a61 100644 --- a/src/Mod/Path/PathScripts/PathToolBit.py +++ b/src/Mod/Path/PathScripts/PathToolBit.py @@ -320,7 +320,7 @@ class ToolBit(object): self._setupProperty(obj, prop, attributes) propNames.append(prop) if not propNames: - PathLog.error(translate('PathToolBit', 'Did not find a PropertyBag in {} - not a ToolBit shape?').format(docName)) + PathLog.error(translate('PathToolBit', 'Did not find a PropertyBag in {} - not a ToolBit shape?'.format(docName))) # has to happen last because it could trigger op.execute evaluations obj.BitPropertyNames = propNames From fa5dc514919e2661b01ed8472054890f3b1644ef Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 23 Feb 2021 19:12:25 -0600 Subject: [PATCH 5/6] fix trailing whitespace --- src/Mod/Path/PathScripts/PathPocketShape.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathPocketShape.py b/src/Mod/Path/PathScripts/PathPocketShape.py index afdac350da..f85dd3e81b 100644 --- a/src/Mod/Path/PathScripts/PathPocketShape.py +++ b/src/Mod/Path/PathScripts/PathPocketShape.py @@ -448,7 +448,7 @@ class ObjectPocket(PathPocketBase.ObjectPocket): # Ensure StartDepth is above FinalDepth if start_dep <= adj_final_dep: start_dep = adj_final_dep + 1.0 - msg = translate('PathPocketShape', 'Start Depth is lower than face depth. Setting to ') + msg = translate('PathPocketShape', 'Start Depth is lower than face depth. Setting to:') PathLog.warning(msg + ' {} mm.'.format(start_dep)) PathLog.debug('LimitDepthToFace adj_final_dep: {}'.format(adj_final_dep)) # Eif From a6fd02cb0402a04cc5c3b908e98aab1deef5dda3 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 23 Feb 2021 19:14:49 -0600 Subject: [PATCH 6/6] Fix whitespace error --- src/Mod/Path/PathScripts/PathPropertyBagGui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathPropertyBagGui.py b/src/Mod/Path/PathScripts/PathPropertyBagGui.py index 7446379b53..5b438f80c0 100644 --- a/src/Mod/Path/PathScripts/PathPropertyBagGui.py +++ b/src/Mod/Path/PathScripts/PathPropertyBagGui.py @@ -403,7 +403,7 @@ class PropertyBagCreateCommand(object): pass def GetResources(self): - return {'MenuText': translate('PathPropertyBag', 'Property Bag'), + return {'MenuText': translate('PathPropertyBag', 'PropertyBag'), 'ToolTip': translate('PathPropertyBag', 'Creates an object which can be used to store reference properties.')} def IsActive(self):