diff --git a/src/Settings/UnitsSettings.cc b/src/Settings/UnitsSettings.cc index e290c17..c8bbfd3 100644 --- a/src/Settings/UnitsSettings.cc +++ b/src/Settings/UnitsSettings.cc @@ -23,12 +23,12 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, horizontalDistanceUnits) // Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading. QStringList enumStrings; QVariantList enumValues; - enumStrings << "Feet" << "Meters"; + enumStrings << UnitsSettings::tr("Feet") << UnitsSettings::tr("Meters"); enumValues << QVariant::fromValue(static_cast(HorizontalDistanceUnitsFeet)) << QVariant::fromValue(static_cast(HorizontalDistanceUnitsMeters)); FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeUint32, this); metaData->setName(horizontalDistanceUnitsName); - metaData->setShortDescription("Distance units"); + metaData->setShortDescription(UnitsSettings::tr("Distance units")); metaData->setEnumInfo(enumStrings, enumValues); HorizontalDistanceUnits defaultHorizontalDistanceUnit = HorizontalDistanceUnitsMeters; @@ -54,12 +54,12 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, verticalDistanceUnits) // Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading. QStringList enumStrings; QVariantList enumValues; - enumStrings << "Feet" << "Meters"; + enumStrings << UnitsSettings::tr("Feet") << UnitsSettings::tr("Meters"); enumValues << QVariant::fromValue(static_cast(VerticalDistanceUnitsFeet)) << QVariant::fromValue(static_cast(VerticalDistanceUnitsMeters)); FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeUint32, this); metaData->setName(verticalDistanceUnitsName); - metaData->setShortDescription("Altitude units"); + metaData->setShortDescription(UnitsSettings::tr("Altitude units")); metaData->setEnumInfo(enumStrings, enumValues); VerticalDistanceUnits defaultVerticalAltitudeUnit = VerticalDistanceUnitsMeters; switch(QLocale::system().measurementSystem()) { @@ -84,7 +84,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits) // Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading. QStringList enumStrings; QVariantList enumValues; - enumStrings << "SquareFeet" << "SquareMeters" << "SquareKilometers" << "Hectares" << "Acres" << "SquareMiles"; + enumStrings << UnitsSettings::tr("SquareFeet") << UnitsSettings::tr("SquareMeters") << UnitsSettings::tr("SquareKilometers") << UnitsSettings::tr("Hectares") << UnitsSettings::tr("Acres") << UnitsSettings::tr("SquareMiles"); enumValues << QVariant::fromValue(static_cast(AreaUnitsSquareFeet)) << QVariant::fromValue(static_cast(AreaUnitsSquareMeters)) << @@ -94,7 +94,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits) QVariant::fromValue(static_cast(AreaUnitsSquareMiles)); FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeUint32, this); metaData->setName(areaUnitsName); - metaData->setShortDescription("Area units"); + metaData->setShortDescription(UnitsSettings::tr("Area units")); metaData->setEnumInfo(enumStrings, enumValues); AreaUnits defaultAreaUnit = AreaUnitsSquareMeters; @@ -120,7 +120,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits) // Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading. QStringList enumStrings; QVariantList enumValues; - enumStrings << "Feet/second" << "Meters/second" << "Miles/hour" << "Kilometers/hour" << "Knots"; + enumStrings << "Feet/second" << "Meters/second" << "Miles/hour" << "Kilometers/hour" << UnitsSettings::tr("Knots"); enumValues << QVariant::fromValue(static_cast(SpeedUnitsFeetPerSecond)) << QVariant::fromValue(static_cast(SpeedUnitsMetersPerSecond)) << @@ -129,7 +129,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits) QVariant::fromValue(static_cast(SpeedUnitsKnots)); FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeUint32, this); metaData->setName(speedUnitsName); - metaData->setShortDescription("Speed units"); + metaData->setShortDescription(UnitsSettings::tr("Speed units")); metaData->setEnumInfo(enumStrings, enumValues); SpeedUnits defaultSpeedUnit = SpeedUnitsMetersPerSecond; @@ -155,11 +155,11 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, temperatureUnits) // Units settings can't be loaded from json since it creates an infinite loop of meta data loading. QStringList enumStrings; QVariantList enumValues; - enumStrings << "Celsius" << "Fahrenheit"; + enumStrings << UnitsSettings::tr("Celsius") << UnitsSettings::tr("Fahrenheit"); enumValues << QVariant::fromValue(static_cast(TemperatureUnitsCelsius)) << QVariant::fromValue(static_cast(TemperatureUnitsFarenheit)); FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeUint32, this); metaData->setName(temperatureUnitsName); - metaData->setShortDescription("Temperature units"); + metaData->setShortDescription(UnitsSettings::tr("Temperature units")); metaData->setEnumInfo(enumStrings, enumValues); TemperatureUnits defaultTemperatureUnit = TemperatureUnitsCelsius; @@ -185,7 +185,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, weightUnits) // Units settings can't be loaded from json since it creates an infinite loop of meta data loading. QStringList enumStrings; QVariantList enumValues; - enumStrings << "Grams" << "Kilograms" << "Ounces" << "Pounds"; + enumStrings << UnitsSettings::tr("Grams") << UnitsSettings::tr("Kilograms") << UnitsSettings::tr("Ounces") << UnitsSettings::tr("Pounds"); enumValues << QVariant::fromValue(static_cast(WeightUnitsGrams)) << QVariant::fromValue(static_cast(WeightUnitsKg))