zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Allow units strings to be localized

QGC4.4
Don Gagne 1 year ago committed by Julian Oes
parent
3cbf805f91
commit
ce72e79cac
No known key found for this signature in database
GPG Key ID: F0ED380FEA56DE41
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/Settings/UnitsSettings.cc

22
src/Settings/UnitsSettings.cc
Unescape View File

@ -23,12 +23,12 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, horizontalDistanceUnits) @@ -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<uint32_t>(HorizontalDistanceUnitsFeet))
<< QVariant::fromValue(static_cast<uint32_t>(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) @@ -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<uint32_t>(VerticalDistanceUnitsFeet))
<< QVariant::fromValue(static_cast<uint32_t>(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) @@ -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<uint32_t>(AreaUnitsSquareFeet)) <<
QVariant::fromValue(static_cast<uint32_t>(AreaUnitsSquareMeters)) <<
@ -94,7 +94,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits) @@ -94,7 +94,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits)
QVariant::fromValue(static_cast<uint32_t>(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) @@ -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<uint32_t>(SpeedUnitsFeetPerSecond)) <<
QVariant::fromValue(static_cast<uint32_t>(SpeedUnitsMetersPerSecond)) <<
@ -129,7 +129,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits) @@ -129,7 +129,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits)
QVariant::fromValue(static_cast<uint32_t>(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) @@ -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<uint32_t>(TemperatureUnitsCelsius)) << QVariant::fromValue(static_cast<uint32_t>(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) @@ -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<uint32_t>(WeightUnitsGrams))
<< QVariant::fromValue(static_cast<uint32_t>(WeightUnitsKg))

Write Preview
Loading…
Cancel
Save