diff --git a/src/blackmisc/pqunits.cpp b/src/blackmisc/pqunits.cpp index f7de957aa..4f738c154 100644 --- a/src/blackmisc/pqunits.cpp +++ b/src/blackmisc/pqunits.cpp @@ -24,7 +24,7 @@ QString CAngleUnit::makeRoundedQString(double value, int digits, bool i18n) cons double de = CMath::trunc(value); double mi = CMath::trunc((value - de) * 100.0); double se = CMath::trunc((value - de - mi / 100.0) * 1000000) / 100.0; - const char *fmt = value < 0 ? "-%L1 %L2'%L3\"" : "%L1 %L2'%L3\""; + const char *fmt = value < 0 ? "-%L1 %L2 %L3" : "%L1 %L2 %L3"; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = s.arg(fabs(de), 0, 'f', 0).arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 2, 'f', digits, '0'); } @@ -32,7 +32,7 @@ QString CAngleUnit::makeRoundedQString(double value, int digits, bool i18n) cons { double de = CMath::trunc(value); double mi = CMath::trunc((value - de) * 100.0); - const char *fmt = value < 0 ? "-%L1 %L2'" : "%L1 %L2'"; + const char *fmt = value < 0 ? "-%L1 %L2" : "%L1 %L2"; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = s.arg(fabs(de), 0, 'f', 0).arg(fabs(mi), 2, 'f', digits, '0'); } diff --git a/src/blackmisc/pqunits.h b/src/blackmisc/pqunits.h index fbaa662a0..d66e9388e 100644 --- a/src/blackmisc/pqunits.h +++ b/src/blackmisc/pqunits.h @@ -257,8 +257,8 @@ public: { static CAngleUnit deg(QT_TRANSLATE_NOOP("CMeasurementUnit", "degree, minute, second"), "DMS", new SubdivisionConverter2<60, 100, 60, 100>, 0); return deg; - (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "%L1 %L2'%L3\""); - (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "%-L1 %L2'%L3\""); + (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "%L1 %L2 %L3"); + (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "-%L1 %L2 %L3"); } /*! @@ -269,8 +269,8 @@ public: { static CAngleUnit deg(QT_TRANSLATE_NOOP("CMeasurementUnit", "degree, minute"), "MinDec", new SubdivisionConverter<60, 100>, 2); return deg; - (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "%L1 %L2'"); - (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "-%L1 %L2'"); + (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "%L1 %L2"); + (void)QT_TRANSLATE_NOOP("CMeasurementUnit", "-%L1 %L2"); } /*!