diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2007-08-22 06:41:27 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2007-08-22 06:41:27 +0000 |
| commit | 2a34ff41f3d88eb4a7fbcdcb409901385491493f (patch) | |
| tree | fe5e7d28f0f5af96a0190daccc064cbcfa5caf05 /apps/menus | |
| parent | b2ea2bd6c5960d20963658b45739edcd4475a68f (diff) | |
| download | rockbox-2a34ff41f3d88eb4a7fbcdcb409901385491493f.zip rockbox-2a34ff41f3d88eb4a7fbcdcb409901385491493f.tar.gz rockbox-2a34ff41f3d88eb4a7fbcdcb409901385491493f.tar.bz2 rockbox-2a34ff41f3d88eb4a7fbcdcb409901385491493f.tar.xz | |
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.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14427 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
| -rw-r--r-- | apps/menus/main_menu.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 934be1d..b6fee44 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -222,7 +222,7 @@ static bool show_info(void) if (hour == 0) hour = 12; - talk_value(hour, UNIT_INT, true); + talk_number(hour, true); /* Voice the minutes */ if (tm->tm_min == 0) @@ -232,7 +232,7 @@ static bool show_info(void) } else { - talk_value(tm->tm_min, UNIT_INT, true); + talk_number(tm->tm_min, true); } talk_id(am_pm_id, true); @@ -240,8 +240,16 @@ static bool show_info(void) else { /*voice the time in 24 hour format*/ - talk_value(tm->tm_hour, UNIT_HOUR, true); - talk_value(tm->tm_min, UNIT_MIN, true); + talk_number(tm->tm_hour, 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_number(tm->tm_mday, true); |