diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2007-08-23 09:13:15 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2007-08-23 09:13:15 +0000 |
| commit | 518b8cc408c09b2bc1eda2b64fe3374f83a47ace (patch) | |
| tree | b63b92cfbb49820b2eecdcc094c97c0bd0bc6f57 /apps | |
| parent | fbd6c7b86318fd43a104d57b704bbef70e64226f (diff) | |
| download | rockbox-518b8cc408c09b2bc1eda2b64fe3374f83a47ace.zip rockbox-518b8cc408c09b2bc1eda2b64fe3374f83a47ace.tar.gz rockbox-518b8cc408c09b2bc1eda2b64fe3374f83a47ace.tar.bz2 rockbox-518b8cc408c09b2bc1eda2b64fe3374f83a47ace.tar.xz | |
Patch FS#7641 by Daniel Dalton, talking clock improvements
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14437 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/lang/english.lang | 17 | ||||
| -rw-r--r-- | apps/menus/main_menu.c | 20 |
2 files changed, 32 insertions, 5 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 29e2d1d..02296bd 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -11105,3 +11105,20 @@ rtc: "A M" </voice> </phrase> +<phrase> + id: VOICE_OH + desc: spoken only, for wall clock announce + user: + <source> + *: none + rtc: "" + </source> + <dest> + *: none + rtc: "" + </dest> + <voice> + *: none + rtc: "oh" + </voice> +</phrase> diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index b6fee44..822301f 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -227,30 +227,40 @@ static bool show_info(void) /* Voice the minutes */ if (tm->tm_min == 0) { - /*say o'clock if the minute is 0. */ + /* Say o'clock if the minute is 0. */ talk_id(VOICE_OCLOCK, true); } else { + /* Pronounce the leading 0 */ + if(tm->tm_min < 10) + { + talk_id(VOICE_OH, true); + } talk_number(tm->tm_min, true); } - talk_id(am_pm_id, true); } else { - /*voice the time in 24 hour format*/ + /* Voice the time in 24 hour format */ talk_number(tm->tm_hour, true); if (tm->tm_min == 0) { - /*say o'clock if the minute is 0. */ - talk_id(VOICE_OCLOCK, true); + talk_id(VOICE_HUNDRED, true); + talk_id(VOICE_HOUR, true); } else { + /* Pronounce the leading 0 */ + if(tm->tm_min < 10) + { + talk_id(VOICE_OH, true); + } talk_number(tm->tm_min, true); } } + talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true); talk_number(tm->tm_mday, true); talk_number(1900 + tm->tm_year, true); |