From 22b2bfe67850962e4d068d9f5454b06b867fbfb7 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Wed, 27 Oct 2021 11:50:07 -0700
Subject: [PATCH] Fix strings which can't be parsed for .ts generation

---
 src/AutoPilotPlugins/APM/APMSubFrameComponent.qml | 4 ++--
 src/MissionManager/CorridorScanComplexItem.cc     | 2 +-
 src/MissionManager/FixedWingLandingComplexItem.cc | 2 +-
 src/MissionManager/StructureScanComplexItem.cc    | 2 +-
 src/MissionManager/SurveyComplexItem.cc           | 2 +-
 src/MissionManager/VTOLLandingComplexItem.cc      | 2 +-
 src/Settings/AppSettings.cc                       | 4 ++--
 src/Settings/UnitsSettings.cc                     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
index 54732a3..46ba61c 100644
--- a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
@@ -216,7 +216,7 @@ SetupPage {
 
                 QGCButton {
                     width:                  parent.width
-                    text:                   qsTr(`Yes, Load default parameter set for ${frameModelSelected.name}`)
+                    text:                   qsTr("Yes, Load default parameter set for %1").arg(frameModelSelected.name)
                     wrapMode:               Text.WordWrap
                     horizontalAlignment:    Text.AlignHCenter
                     visible:                frameModelSelected.paramFileName != undefined
@@ -237,7 +237,7 @@ SetupPage {
                             return qsTr("No, set frame only")
                         }
 
-                        return qsTr(`Confirm frame ${frameModelSelected.name}`)
+                        return qsTr("Confirm frame %1").arg(frameModelSelected.name)
                     }
 
                     onClicked: {
diff --git a/src/MissionManager/CorridorScanComplexItem.cc b/src/MissionManager/CorridorScanComplexItem.cc
index 6e33650..565cc92 100644
--- a/src/MissionManager/CorridorScanComplexItem.cc
+++ b/src/MissionManager/CorridorScanComplexItem.cc
@@ -22,7 +22,7 @@
 
 QGC_LOGGING_CATEGORY(CorridorScanComplexItemLog, "CorridorScanComplexItemLog")
 
-const QString CorridorScanComplexItem::name(tr("Corridor Scan"));
+const QString CorridorScanComplexItem::name(CorridorScanComplexItem::tr("Corridor Scan"));
 
 const char* CorridorScanComplexItem::settingsGroup =            "CorridorScan";
 const char* CorridorScanComplexItem::corridorWidthName =        "CorridorWidth";
diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc
index 70d8e0b..e852adb 100644
--- a/src/MissionManager/FixedWingLandingComplexItem.cc
+++ b/src/MissionManager/FixedWingLandingComplexItem.cc
@@ -19,7 +19,7 @@
 
 QGC_LOGGING_CATEGORY(FixedWingLandingComplexItemLog, "FixedWingLandingComplexItemLog")
 
-const QString FixedWingLandingComplexItem::name(tr("Fixed Wing Landing"));
+const QString FixedWingLandingComplexItem::name(FixedWingLandingComplexItem::tr("Fixed Wing Landing"));
 
 const char* FixedWingLandingComplexItem::settingsGroup                      = "FixedWingLanding";
 const char* FixedWingLandingComplexItem::jsonComplexItemTypeValue           = "fwLandingPattern";
diff --git a/src/MissionManager/StructureScanComplexItem.cc b/src/MissionManager/StructureScanComplexItem.cc
index a190ede..9505be7 100644
--- a/src/MissionManager/StructureScanComplexItem.cc
+++ b/src/MissionManager/StructureScanComplexItem.cc
@@ -23,7 +23,7 @@
 
 QGC_LOGGING_CATEGORY(StructureScanComplexItemLog, "StructureScanComplexItemLog")
 
-const QString StructureScanComplexItem::name(tr("Structure Scan"));
+const QString StructureScanComplexItem::name(StructureScanComplexItem::tr("Structure Scan"));
 
 const char* StructureScanComplexItem::settingsGroup =               "StructureScan";
 const char* StructureScanComplexItem::_entranceAltName =            "EntranceAltitude";
diff --git a/src/MissionManager/SurveyComplexItem.cc b/src/MissionManager/SurveyComplexItem.cc
index c33173a..ebc63ce 100644
--- a/src/MissionManager/SurveyComplexItem.cc
+++ b/src/MissionManager/SurveyComplexItem.cc
@@ -22,7 +22,7 @@
 
 QGC_LOGGING_CATEGORY(SurveyComplexItemLog, "SurveyComplexItemLog")
 
-const QString SurveyComplexItem::name(tr("Survey"));
+const QString SurveyComplexItem::name(SurveyComplexItem::tr("Survey"));
 
 const char* SurveyComplexItem::jsonComplexItemTypeValue =   "survey";
 const char* SurveyComplexItem::jsonV3ComplexItemTypeValue = "survey";
diff --git a/src/MissionManager/VTOLLandingComplexItem.cc b/src/MissionManager/VTOLLandingComplexItem.cc
index 9665203..60478bf 100644
--- a/src/MissionManager/VTOLLandingComplexItem.cc
+++ b/src/MissionManager/VTOLLandingComplexItem.cc
@@ -20,7 +20,7 @@
 
 QGC_LOGGING_CATEGORY(VTOLLandingComplexItemLog, "VTOLLandingComplexItemLog")
 
-const QString VTOLLandingComplexItem::name(tr("VTOL Landing"));
+const QString VTOLLandingComplexItem::name(VTOLLandingComplexItem::tr("VTOL Landing"));
 
 const char* VTOLLandingComplexItem::settingsGroup =            "VTOLLanding";
 const char* VTOLLandingComplexItem::jsonComplexItemTypeValue = "vtolLandingPattern";
diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc
index 8964783..c5b5956 100644
--- a/src/Settings/AppSettings.cc
+++ b/src/Settings/AppSettings.cc
@@ -179,7 +179,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(AppSettings, qLocaleLanguage)
         }
         for (int i=0; i<rgOriginalStrings.count(); i++) {
             if (_rgPartialLanguages.contains(rgOriginalValues[i].toInt())) {
-                rgUpdatedStrings.append(rgOriginalStrings[i] + tr(" (Partial)"));
+                rgUpdatedStrings.append(rgOriginalStrings[i] + AppSettings::tr(" (Partial)"));
                 rgUpdatedValues.append(rgOriginalValues[i].toInt());
             }
         }
@@ -188,7 +188,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(AppSettings, qLocaleLanguage)
         for (int i=0; i<rgOriginalStrings.count(); i++) {
             int languageId = rgOriginalValues[i].toInt();
             if (!_rgReleaseLanguages.contains(languageId)  || !_rgPartialLanguages.contains(languageId)) {
-                rgUpdatedStrings.append(rgOriginalStrings[i] + tr(" (Test only)"));
+                rgUpdatedStrings.append(rgOriginalStrings[i] + AppSettings::tr(" (Test only)"));
                 rgUpdatedValues.append(rgOriginalValues[i].toInt());
             }
         }
diff --git a/src/Settings/UnitsSettings.cc b/src/Settings/UnitsSettings.cc
index 2c226fc..90d496d 100644
--- a/src/Settings/UnitsSettings.cc
+++ b/src/Settings/UnitsSettings.cc
@@ -193,7 +193,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, weightUnits)
             << QVariant::fromValue(static_cast<uint32_t>(WeightUnitsLbs));
         FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeUint32, this);
         metaData->setName(weightUnitsName);
-        metaData->setShortDescription(tr("Weight units"));
+        metaData->setShortDescription(UnitsSettings::tr("Weight units"));
         metaData->setEnumInfo(enumStrings, enumValues);
         WeightUnits defaultWeightUnit = WeightUnitsGrams;
         switch(QLocale::system().measurementSystem()) {