From 2a34ff41f3d88eb4a7fbcdcb409901385491493f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 22 Aug 2007 06:41:27 +0000 Subject: 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 --- apps/menus/main_menu.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 934be1d880..b6fee4416d 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); -- cgit v1.2.3