From 7304a7350f9ebb0bebeb0d2f59b347ac7a85b438 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Mon, 17 Nov 2025 14:39:49 -0600 Subject: [PATCH] Measure: Translate measurement types --- src/Mod/Measure/App/AppMeasure.cpp | 14 +++++++------- src/Mod/Measure/Gui/TaskMeasure.cpp | 4 ++-- src/Mod/Measure/InitGui.py | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp index 5f8a11a419..65e5d9f9c6 100644 --- a/src/Mod/Measure/App/AppMeasure.cpp +++ b/src/Mod/Measure/App/AppMeasure.cpp @@ -112,7 +112,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "DISTANCE", - "Distance", + QT_TRANSLATE_NOOP("TaskMeasure", "Distance"), "Measure::MeasureDistance", MeasureDistance::isValidSelection, MeasureDistance::isPrioritizedSelection @@ -120,7 +120,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "DISTANCEFREE", - "Distance Free", + QT_TRANSLATE_NOOP("TaskMeasure", "Distance Free"), "Measure::MeasureDistanceDetached", MeasureDistanceDetached::isValidSelection, nullptr @@ -128,7 +128,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "ANGLE", - "Angle", + QT_TRANSLATE_NOOP("TaskMeasure", "Angle"), "Measure::MeasureAngle", MeasureAngle::isValidSelection, MeasureAngle::isPrioritizedSelection @@ -136,7 +136,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "LENGTH", - "Length", + QT_TRANSLATE_NOOP("TaskMeasure", "Length"), "Measure::MeasureLength", MeasureLength::isValidSelection, nullptr @@ -144,7 +144,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "POSITION", - "Position", + QT_TRANSLATE_NOOP("TaskMeasure", "Position"), "Measure::MeasurePosition", MeasurePosition::isValidSelection, nullptr @@ -152,7 +152,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "AREA", - "Area", + QT_TRANSLATE_NOOP("TaskMeasure", "Area"), "Measure::MeasureArea", MeasureArea::isValidSelection, nullptr @@ -160,7 +160,7 @@ PyMOD_INIT_FUNC(Measure) App::MeasureManager::addMeasureType( "RADIUS", - "Radius", + QT_TRANSLATE_NOOP("TaskMeasure", "Radius"), "Measure::MeasureRadius", MeasureRadius::isValidSelection, MeasureRadius::isPrioritizedSelection diff --git a/src/Mod/Measure/Gui/TaskMeasure.cpp b/src/Mod/Measure/Gui/TaskMeasure.cpp index 7da5a53d13..8269d94d2b 100644 --- a/src/Mod/Measure/Gui/TaskMeasure.cpp +++ b/src/Mod/Measure/Gui/TaskMeasure.cpp @@ -131,10 +131,10 @@ TaskMeasure::TaskMeasure() // Create mode dropdown and add all registered measuretypes modeSwitch = new QComboBox(); - modeSwitch->addItem(QStringLiteral("Auto")); + modeSwitch->addItem(tr("Auto")); for (App::MeasureType* mType : App::MeasureManager::getMeasureTypes()) { - modeSwitch->addItem(QString::fromLatin1(mType->label.c_str())); + modeSwitch->addItem(tr(mType->label.c_str())); } // Connect dropdown's change signal to our onModeChange slot diff --git a/src/Mod/Measure/InitGui.py b/src/Mod/Measure/InitGui.py index 72f845cc7d..937f20caa5 100644 --- a/src/Mod/Measure/InitGui.py +++ b/src/Mod/Measure/InitGui.py @@ -38,9 +38,11 @@ Measure.makeMeasureCOM = makeMeasureCOM # Register python measure types import FreeCAD +from PySide.QtCore import QT_TRANSLATE_NOOP + FreeCAD.MeasureManager.addMeasureType( "CENTEROFMASS", - "Center of mass", + QT_TRANSLATE_NOOP("TaskMeasure", "Center of mass"), MeasureCOM, )