Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang: Support languages that speak the units before a numerical value

Browse source 
Previously, it was hardcoded to the english convention of units-last, so
"100%" would be voiced as "one hundred percent".  This adds a new
language flag that makes the units be voiced first, ie "100%" will be
voiced as "percent one hundred".

So far only the Chinese-traditional and Chinese-simplified languages
utilize this feature (taken from an old ticket, FS#10340) but I'm sure
others would want this feature too.

Change-Id: Idf825ec9299dc0ed09921cf67aec61b1ab262fc6
This commit is contained in:
Solomon Peachy 2023-05-22 10:30:13 -04:00
parent ab0ba139f5
commit 92b80bdba5
6 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/lang/chinese-simp.lang
View file

@ -13,6 +13,8 @@
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
# LANGUAGE_UNITS_FIRST
#
# Simplified Chinese language file, translated by:
# - Ye Wei
# - Xinlu Huang

2
apps/lang/chinese-trad.lang
View file

@ -13,6 +13,8 @@
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
# LANGUAGE_UNITS_FIRST
#
# Traditional Chinese language file, translated by:
# - Wenbin Leo
# - Xinlu Huang

13
apps/language.c
View file

@ -37,7 +37,9 @@
/* See tools/genlang (TODO: Use common include for both) */
#define LANGUAGE_COOKIE 0x1a
#define LANGUAGE_VERSION 0x06
#define LANGUAGE_FLAG_RTL 0x01
#define LANGUAGE_FLAG_RTL 0x01
#define LANGUAGE_FLAG_UNITS_FIRST 0x02
#define HEADER_SIZE 4
#define SUBHEADER_SIZE 6
@ -54,8 +56,8 @@ void lang_init(const unsigned char *builtin, unsigned char **dest, int count)
}
}
int lang_load(const char *filename, const unsigned char *builtin,
unsigned char **dest, unsigned char *buffer,
int lang_load(const char *filename, const unsigned char *builtin,
unsigned char **dest, unsigned char *buffer,
unsigned int user_num, int max_lang_size,
unsigned int max_id)
{
@ -143,3 +145,8 @@ int lang_is_rtl(void)
{
return (lang_options & LANGUAGE_FLAG_RTL) != 0;
}
int lang_units_first(void)
{
return (lang_options & LANGUAGE_FLAG_UNITS_FIRST) != 0;
}

2
apps/language.h
View file

@ -37,4 +37,6 @@ int lang_english_to_id(const char *english);
/* returns whether the loaded language is a right-to-left language */
int lang_is_rtl(void);
/* returns whether the loaded language needs units spoken before the value */
int lang_units_first(void);
#endif

6
apps/talk.c
View file

@ -35,6 +35,7 @@
#include "voice_thread.h"
#include "audio.h"
#include "lang.h"
#include "language.h"
#include "talk.h"
#include "metadata.h"
/*#define LOGF_ENABLE*/
@ -1419,8 +1420,11 @@ int talk_value_decimal(long n, int unit, int decimals, bool enqueue)
return 0;
}
if (lang_units_first())
talk_id(unit_id, true); /* say the unit, if any */
talk_number(n, enqueue); /* say the number */
talk_id(unit_id, true); /* say the unit, if any */
if (!lang_units_first())
talk_id(unit_id, true); /* say the unit, if any */
return 0;
}

4
tools/genlang
View file

@ -16,6 +16,7 @@ my $LANGUAGE_COOKIE = 0x1a;
my $VOICE_COOKIE = 0x9a;
my $LANGUAGE_VERSION = 0x06;
my $LANGUAGE_FLAG_RTL = 0x01;
my $LANGUAGE_FLAG_UNITS_FIRST = 0x02;
my $HEADER_SIZE = 4;
my $SUBHEADER_SIZE = 6;
@ -372,6 +373,9 @@ while(<LANG>) {
if ($_ =~ /LANGUAGE_IS_RTL/) {
$langoptions |= $LANGUAGE_FLAG_RTL;
}
if ($_ =~ /LANGUAGE_UNITS_FIRST/) {
$langoptions |= $LANGUAGE_FLAG_UNITS_FIRST;
}
if ($header and $sortfile) {
print($_);