devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Don't say 'hours' and 'minutes' in the 24 hour time announcement, and use 'o'clock' for full hours too. Some further simplification for 12 hour time announcement.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14427 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-08-22 06:41:27 +00:00
parent b2ea2bd6c5
commit 2a34ff41f3
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/menus/main_menu.c
View file

@ -222,7 +222,7 @@ static bool show_info(void)
if (hour == 0) if (hour == 0)
hour = 12; hour = 12;
talk_value(hour, UNIT_INT, true); talk_number(hour, true);
/* Voice the minutes */ /* Voice the minutes */
if (tm->tm_min == 0) if (tm->tm_min == 0)
@ -232,7 +232,7 @@ static bool show_info(void)
} }
else else
{ {
talk_value(tm->tm_min, UNIT_INT, true); talk_number(tm->tm_min, true);
} }
talk_id(am_pm_id, true); talk_id(am_pm_id, true);
@ -240,8 +240,16 @@ static bool show_info(void)
else else
{ {
/*voice the time in 24 hour format*/ /*voice the time in 24 hour format*/
talk_value(tm->tm_hour, UNIT_HOUR, true); talk_number(tm->tm_hour, true);
talk_value(tm->tm_min, UNIT_MIN, true); if (tm->tm_min == 0)
{
/*say o'clock if the minute is 0. */
talk_id(VOICE_OCLOCK, true);
}
else
{
talk_number(tm->tm_min, true);
}
} }
talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true); talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true);
talk_number(tm->tm_mday, true); talk_number(tm->tm_mday, true);