Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Precison 1 now also works. Could anyone else check the code?

Browse source
This commit is contained in:
Benjamin Boy 2016-11-04 11:42:15 +01:00
parent 236d3149ee
commit 3e952be074
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
radio/src/translations/tts_de.cpp
View file

@ -131,15 +131,14 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#endif #endif
div_t qr = div(number, 10); div_t qr = div(number, 10);
if (qr.rem > 0) { if (qr.rem > 0) {
PLAY_NUMBER(qr.quot, 0, 0); PUSH_NUMBER_PROMPT(qr.quot);
PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA); PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA);
if (mode==2 && qr.rem < 10) PUSH_NUMBER_PROMPT(qr.rem);
PUSH_NUMBER_PROMPT(DE_PROMPT_NULL);
PLAY_NUMBER(qr.rem, unit, 0);
} }
else { else {
PLAY_NUMBER(qr.quot, unit, 0); PUSH_NUMBER_PROMPT(qr.quot);
} }
DE_PUSH_UNIT_PROMPT(unit);
return; return;
} }
@ -147,52 +146,50 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PLAY_NUMBER(number / 1000, 0, 0); PLAY_NUMBER(number / 1000, 0, 0);
PUSH_NUMBER_PROMPT(DE_PROMPT_TAUSEND); PUSH_NUMBER_PROMPT(DE_PROMPT_TAUSEND);
number %= 1000; number %= 1000;
if (number == 0)
number = -1;
} }
if ((number >= 1000) && (number < 2000)) { if ((number >= 1000) && (number < 2000)) {
PUSH_NUMBER_PROMPT(DE_PROMPT_EIN); PUSH_NUMBER_PROMPT(DE_PROMPT_EIN);
PUSH_NUMBER_PROMPT(DE_PROMPT_TAUSEND); PUSH_NUMBER_PROMPT(DE_PROMPT_TAUSEND);
number %= 1000; number %= 1000;
if (number == 0)
number = -1;
} }
if ((number >= 200) && (number < 1000)) { if ((number >= 200) && (number < 1000)) {
PUSH_NUMBER_PROMPT(DE_PROMPT_NULL + number / 100); PUSH_NUMBER_PROMPT(DE_PROMPT_NULL + number / 100);
PUSH_NUMBER_PROMPT(DE_PROMPT_HUNDERT); PUSH_NUMBER_PROMPT(DE_PROMPT_HUNDERT);
number %= 100; number %= 100;
if (number == 0)
number = -1;
} }
if ((number >= 100) && (number < 200)) { if ((number >= 100) && (number < 200)) {
PUSH_NUMBER_PROMPT(DE_PROMPT_EIN); PUSH_NUMBER_PROMPT(DE_PROMPT_EIN);
PUSH_NUMBER_PROMPT(DE_PROMPT_HUNDERT); PUSH_NUMBER_PROMPT(DE_PROMPT_HUNDERT);
number %= 100; number %= 100;
if (number == 0)
number = -1;
} }
if (number > 0){ if (number >= 0) {
if (number == 1){ if (number == 1) {
PUSH_NUMBER_PROMPT(DE_PROMPT_EIN); PUSH_NUMBER_PROMPT(DE_PROMPT_EIN);
} }
else { else {
PUSH_NUMBER_PROMPT(DE_PROMPT_NULL + number / 1); PUSH_NUMBER_PROMPT(DE_PROMPT_NULL + number / 1);
number %= 1;
} }
} }
if (number == 0)
number = -1;
if (unit) { if (unit) {
DE_PUSH_UNIT_PROMPT(unit); DE_PUSH_UNIT_PROMPT(unit);
} }
} }
I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT) I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
{ {
if (seconds == 0) {
PLAY_NUMBER(seconds, 0, 0);
return;
}
if (seconds < 0) { if (seconds < 0) {
PUSH_NUMBER_PROMPT(DE_PROMPT_MINUS); PUSH_NUMBER_PROMPT(DE_PROMPT_MINUS);
seconds = -seconds; seconds = -seconds;
@ -210,7 +207,6 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
PUSH_NUMBER_PROMPT(DE_PROMPT_EINE); PUSH_NUMBER_PROMPT(DE_PROMPT_EINE);
PUSH_NUMBER_PROMPT(DE_PROMPT_STUNDE); PUSH_NUMBER_PROMPT(DE_PROMPT_STUNDE);
} }
if (seconds > 0) { if (seconds > 0) {
PUSH_NUMBER_PROMPT(DE_PROMPT_UND); PUSH_NUMBER_PROMPT(DE_PROMPT_UND);
} }
@ -242,9 +238,6 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
PUSH_NUMBER_PROMPT(DE_PROMPT_EINE); PUSH_NUMBER_PROMPT(DE_PROMPT_EINE);
PUSH_NUMBER_PROMPT(DE_PROMPT_SEKUNDE); PUSH_NUMBER_PROMPT(DE_PROMPT_SEKUNDE);
} }
else {
PLAY_NUMBER(seconds, 0, 0);
}
} }
} }