From b41762bcf493b92d5f3c7575193aad090a5a1adb Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 2 Nov 2013 07:44:59 +0000 Subject: [PATCH] [all] Fix for issue 177. Ported to all other languages --- src/translations/tts_cz.cpp | 2 +- src/translations/tts_de.cpp | 2 +- src/translations/tts_es.cpp | 2 +- src/translations/tts_fr.cpp | 2 +- src/translations/tts_it.cpp | 2 +- src/translations/tts_pt.cpp | 2 +- src/translations/tts_se.cpp | 2 +- src/translations/tts_sk.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/translations/tts_cz.cpp b/src/translations/tts_cz.cpp index 48059076b..c2bbe6037 100644 --- a/src/translations/tts_cz.cpp +++ b/src/translations/tts_cz.cpp @@ -125,7 +125,7 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_de.cpp b/src/translations/tts_de.cpp index 234bd0d82..1afadbf4e 100644 --- a/src/translations/tts_de.cpp +++ b/src/translations/tts_de.cpp @@ -115,7 +115,7 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_es.cpp b/src/translations/tts_es.cpp index 2765de647..928abf46b 100644 --- a/src/translations/tts_es.cpp +++ b/src/translations/tts_es.cpp @@ -139,7 +139,7 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_fr.cpp b/src/translations/tts_fr.cpp index 0a74b483d..a377be4b6 100644 --- a/src/translations/tts_fr.cpp +++ b/src/translations/tts_fr.cpp @@ -121,7 +121,7 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_it.cpp b/src/translations/tts_it.cpp index 5e5988009..77dd000f3 100644 --- a/src/translations/tts_it.cpp +++ b/src/translations/tts_it.cpp @@ -111,7 +111,7 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_pt.cpp b/src/translations/tts_pt.cpp index 615e5ec2d..affb4e17a 100644 --- a/src/translations/tts_pt.cpp +++ b/src/translations/tts_pt.cpp @@ -124,7 +124,7 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_se.cpp b/src/translations/tts_se.cpp index 4fbf111d1..97e81cb05 100644 --- a/src/translations/tts_se.cpp +++ b/src/translations/tts_se.cpp @@ -89,7 +89,7 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; } diff --git a/src/translations/tts_sk.cpp b/src/translations/tts_sk.cpp index 1fadc6a8d..a2935a7ea 100644 --- a/src/translations/tts_sk.cpp +++ b/src/translations/tts_sk.cpp @@ -140,7 +140,7 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } #if defined(CPUARM) - if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) { + if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_METERS && number >= 100))) { number /= 10; att -= PREC1; }