From e54297313b0465cb94b1552c9e1ad19ee23d85d6 Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Fri, 19 Sep 2014 10:16:48 +0200 Subject: [PATCH] fixes #1755: don't translate toolbar names in InitGui.py of Arch and Spreadsheet --- src/Mod/Arch/InitGui.py | 7 ++++--- src/Mod/Spreadsheet/InitGui.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 3483bff1b..3412b3bb6 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -20,6 +20,7 @@ #* USA * #* * #*************************************************************************** +def QT_TRANSLATE_NOOP(scope, text): return text class ArchWorkbench(Workbench): "Arch workbench object" @@ -102,9 +103,9 @@ class ArchWorkbench(Workbench): 'Draft_Snap_Extension','Draft_Snap_Near','Draft_Snap_Ortho', 'Draft_Snap_Dimensions','Draft_Snap_WorkingPlane'] - self.appendToolbar(translate("arch","Arch tools"),self.archtools) - self.appendToolbar(translate("arch","Draft tools"),self.drafttools) - self.appendToolbar(translate("arch","Draft mod tools"),self.draftmodtools) + self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Arch tools"),self.archtools) + self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft tools"),self.drafttools) + self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft mod tools"),self.draftmodtools) self.appendMenu([translate("arch","&Architecture"),translate("arch","Utilities")],self.utilities) self.appendMenu(translate("arch","&Architecture"),self.archtools) self.appendMenu(translate("arch","&Draft"),self.drafttools+self.draftmodtools+self.draftextratools) diff --git a/src/Mod/Spreadsheet/InitGui.py b/src/Mod/Spreadsheet/InitGui.py index 13de247fe..f4c39f5b1 100644 --- a/src/Mod/Spreadsheet/InitGui.py +++ b/src/Mod/Spreadsheet/InitGui.py @@ -19,6 +19,7 @@ #* USA * #* * #*************************************************************************** +def QT_TRANSLATE_NOOP(scope, text): return text class SpreadsheetWorkbench(Workbench): "Spreadsheet workbench object" @@ -55,7 +56,7 @@ class SpreadsheetWorkbench(Workbench): import Spreadsheet,Spreadsheet_rc from DraftTools import translate commands = ["Spreadsheet_Create","Spreadsheet_Controller","Spreadsheet_PropertyController"] - self.appendToolbar(str(translate("Spreadsheet","Spreadsheet tools")),commands) + self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Spreadsheet tools"),commands) self.appendMenu(str(translate("Spreadsheet","&Spreadsheet")),commands) FreeCADGui.addIconPath(":/icons") FreeCADGui.addLanguagePath(":/translations")