piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Plurals and indefinite articles in German TTS, plus (#3920)

Browse Source 
- fixed no LUA constant for unit dbm
- fixed use plurals and indefinite articles in German TTS
This commit is contained in:
Michael
2023-08-26 21:09:41 +10:00
committed by GitHub
parent c66da428be
commit c2bebfbbd3
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/audio.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ const char * const unitsFilenames[] = {
"rpm", "rpm",
"g", "g",
"degree", "degree",
"radian", "rad",
"ml", "ml",
"founce", "founce",
"mlpm", "mlpm",
radio/src/lua/api_general.cpp
+1
View File
@@ -3224,6 +3224,7 @@ LROT_BEGIN(etxcst, NULL, 0)
LROT_NUMENTRY( UNIT_HERTZ, UNIT_HERTZ ) LROT_NUMENTRY( UNIT_HERTZ, UNIT_HERTZ )
LROT_NUMENTRY( UNIT_MS, UNIT_MS ) LROT_NUMENTRY( UNIT_MS, UNIT_MS )
LROT_NUMENTRY( UNIT_US, UNIT_US ) LROT_NUMENTRY( UNIT_US, UNIT_US )
LROT_NUMENTRY( UNIT_DBM, UNIT_DBM )
LROT_NUMENTRY( UNIT_HOURS, UNIT_HOURS ) LROT_NUMENTRY( UNIT_HOURS, UNIT_HOURS )
LROT_NUMENTRY( UNIT_MINUTES, UNIT_MINUTES ) LROT_NUMENTRY( UNIT_MINUTES, UNIT_MINUTES )
LROT_NUMENTRY( UNIT_SECONDS, UNIT_SECONDS ) LROT_NUMENTRY( UNIT_SECONDS, UNIT_SECONDS )
radio/src/translations/tts_de.cpp
+30 -6
View File
@@ -64,11 +64,23 @@ enum GermanPrompts {
}; };
#define DE_PUSH_UNIT_PROMPT(u) de_pushUnitPrompt((u), id) #define DE_PUSH_UNIT_PROMPT(u, p) de_pushUnitPrompt((u), (p), id)
I18N_PLAY_FUNCTION(de, pushUnitPrompt, uint8_t unitprompt) I18N_PLAY_FUNCTION(de, pushUnitPrompt, uint8_t unitprompt, int16_t number)
{ {
PUSH_UNIT_PROMPT(unitprompt, 0); if(number != 1 && // do plurals for this list of units if number is not 1
(unitprompt == UNIT_HOURS ||
unitprompt == UNIT_MINUTES ||
unitprompt == UNIT_SECONDS ||
unitprompt == UNIT_FLOZ ||
unitprompt == UNIT_MS ||
unitprompt == UNIT_US ||
unitprompt == UNIT_RADIANS ||
unitprompt == UNIT_MAH)) {
PUSH_UNIT_PROMPT(unitprompt, 1); // push xxx1.wav for plural version
}
else
PUSH_UNIT_PROMPT(unitprompt, 0); // push xxx0.wav for singular version
} }
I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att) I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
@@ -109,10 +121,12 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
} }
} }
if(unit) if(unit)
DE_PUSH_UNIT_PROMPT(unit); DE_PUSH_UNIT_PROMPT(unit, qr.quot);
return; return;
} }
int16_t tmp = number;
if (number >= 2000) { if (number >= 2000) {
PLAY_NUMBER(number / 1000, 0, 0); PLAY_NUMBER(number / 1000, 0, 0);
PUSH_NUMBER_PROMPT(DE_PROMPT_TAUSEND); PUSH_NUMBER_PROMPT(DE_PROMPT_TAUSEND);
@@ -146,11 +160,21 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
} }
if (number >= 0) { if (number >= 0) {
PUSH_NUMBER_PROMPT(DE_PROMPT_NULL + number / 1); if(number == 1) {
if(unit == UNIT_HOURS ||
unit == UNIT_MINUTES ||
unit == UNIT_SECONDS ||
unit == UNIT_FLOZ ||
unit == UNIT_MS ||
unit == UNIT_US ||
unit == UNIT_MAH)
PUSH_NUMBER_PROMPT(DE_PROMPT_EINE); // "eine ..."
} else
PUSH_NUMBER_PROMPT(DE_PROMPT_NULL + number / 1); // "ein ...""
} }
if (unit) { if (unit) {
DE_PUSH_UNIT_PROMPT(unit); DE_PUSH_UNIT_PROMPT(unit, tmp);
} }
} }