len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

talk: Add support for languages that swap the tens position in numbers

Browse source 
For example, English would say "231" as "two hundred thirty one" but
many other languages would say "two hundred one and thirty"

So, if VOICE_NUMERIC_TENS_SWAP_SEPARATOR is not an empty string, swap
the tens and ones position and use that string ("and" in the above
example) as the voiced separator.

Change-Id: I69f8064d44b3995827327cabae6ad352bf257d04
This commit is contained in:
Solomon Peachy 2021-09-21 19:16:23 -04:00
parent 3cc7509e81
commit 70e72e01d2
5 changed files with 86 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

45
apps/talk.c
View file

@ -1188,17 +1188,44 @@ int talk_number(long n, bool enqueue)
talk_id(VOICE_HUNDRED, true);
}
/* combination indexing */
if (ones > 20)
struct queue_entry tens_swap;
if (get_clip(VOICE_NUMERIC_TENS_SWAP_SEPARATOR, &tens_swap) >= 0)
{
int tens = ones/10 + 18;
talk_id(VOICE_ZERO + tens, true);
ones %= 10;
/* direct indexing */
if (ones <= 20)
{
talk_id(VOICE_ZERO + ones, true);
}
else if (ones)
{
int tmp = ones % 10;
if (tmp)
{
talk_id(VOICE_ZERO + tmp, true);
talk_id(VOICE_NUMERIC_TENS_SWAP_SEPARATOR, true);
}
}
/* combination indexing */
if (ones > 20)
{
int tens = ones/10 + 18;
talk_id(VOICE_ZERO + tens, true);
}
}
else
{
/* combination indexing */
if (ones > 20)
{
int tens = ones/10 + 18;
talk_id(VOICE_ZERO + tens, true);
ones %= 10;
}
/* direct indexing */
if (ones)
talk_id(VOICE_ZERO + ones, true);
/* direct indexing */
if (ones)
talk_id(VOICE_ZERO + ones, true);
}
/* add billion, million, thousand */
if (mil)
@ -1215,7 +1242,7 @@ int talk_number(long n, bool enqueue)
static int talk_year(long year, bool enqueue)
{
int rem;
if(year < 1100 || year >=2000)
if(year < 1100 || (year >=2000 && year < 2100))
/* just say it as a regular number */
return talk_number(year, enqueue);
/* Say century */