Meters in PREC1 should not be played as Feet in PREC1 (all languages)
This commit is contained in:
+1
-1
@@ -2355,7 +2355,7 @@ PLAY_FUNCTION(playValue, uint8_t idx)
|
||||
|
||||
case MIXSRC_FIRST_TELEM-1+TELEM_ALT-1:
|
||||
#if defined(PCBTARANIS)
|
||||
PLAY_NUMBER(val/100, 1+UNIT_METERS, 0);
|
||||
PLAY_NUMBER(val/10, 1+UNIT_METERS, PREC1);
|
||||
break;
|
||||
#endif
|
||||
case MIXSRC_FIRST_TELEM-1+TELEM_MIN_ALT-1:
|
||||
|
||||
@@ -650,11 +650,11 @@
|
||||
//Taranis About screen
|
||||
#define TR_ABOUTUS TR(" O n\200s ", "O n\200s")
|
||||
|
||||
#define TR_ABOUT_OPENTX_1 "opentx je nekomer\201n\204,"
|
||||
#define TR_ABOUT_OPENTX_2 "bez jak\202koliv z\200ruky."
|
||||
#define TR_ABOUT_OPENTX_3 TR("Vytvo\206en ve voln\202m \201ase.", "Byl vytvo\206en ve voln\202m \201ase.")
|
||||
#define TR_ABOUT_OPENTX_4 "Podpora v\212voje pomoc\204"
|
||||
#define TR_ABOUT_OPENTX_5 TR("finan\201n\204ho daru je v\204t\200na!", "finan\201n\204ho daru je v\204t\200na")
|
||||
#define TR_ABOUT_OPENTX_1 TR("opentx je nekomer\201n\204,", "Firmware tohoto r\200dia")
|
||||
#define TR_ABOUT_OPENTX_2 TR("bez jak\202koliv z\200ruky.", " je podporov\200n firmou FrSky.")
|
||||
#define TR_ABOUT_OPENTX_3 TR("Vytvo\206en ve voln\202m \201ase.", "OpenTX je open-source,")
|
||||
#define TR_ABOUT_OPENTX_4 TR("Podpora v\212voje pomoc\204", " bez jak\202koliv z\200ruky.")
|
||||
#define TR_ABOUT_OPENTX_5 TR("finan\201n\204ho daru je v\204t\200na!", "Finan\201n\204 dary jsou v\204t\200ny!")
|
||||
|
||||
#define TR_ABOUT_BERTRAND_1 "Bertrand Songis"
|
||||
#define TR_ABOUT_BERTRAND_2 "Hlavn\204 v\212voj\200\206 OpenTX"
|
||||
|
||||
@@ -117,14 +117,20 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
unit--;
|
||||
convertUnit(number, unit);
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
unit--;
|
||||
convertUnit(number, unit);
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
}
|
||||
|
||||
int8_t mode = MODE(att);
|
||||
|
||||
@@ -112,6 +112,12 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
|
||||
@@ -136,6 +136,12 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
|
||||
@@ -118,6 +118,12 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
|
||||
@@ -108,6 +108,12 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
|
||||
@@ -121,6 +121,12 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
|
||||
@@ -137,6 +137,12 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_METERS) {
|
||||
unit = UNIT_FEET;
|
||||
#if defined(CPUARM)
|
||||
if (att & PREC1) {
|
||||
number /= 10;
|
||||
att -= PREC1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
|
||||
Reference in New Issue
Block a user