diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-08 02:14:42 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-08 02:14:42 +0000 |
commit | e463c42ba7f5eebc82988f7b09509ecd99de55bc (patch) | |
tree | afcaa3fe75ad82865ebd0c5fb3db8f25486a6f2f | |
parent | 00d3c314965cdf06220b31db6e52437cc207b450 (diff) |
issue #5576
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | ChangeLog | 2 | ||||
-rwxr-xr-x | say.c | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,7 @@ 2005-11-07 Kevin P. Fleming <kpfleming@digium.com> + * say.c (ast_say_date_with_format_da): say hours properly (issue #5576) + * manager.c (astman_get_variables): restore old multiple-variable behavior for "Variable" header (issue #5585) * many files: don't check for NULL before calling ast_strlen_zero, it can do it itself (issue #5648) @@ -3286,12 +3286,14 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha } break; case 'H': + /* 24-Hour, single digit hours preceeded by "oh" (0) */ + if (tm.tm_hour < 10 && tm.tm_hour > 0) { + res = wait_file(chan,ints, "digits/0",lang); + } + /* FALLTRHU */ case 'k': /* 24-Hour */ - res = wait_file(chan,ints,"digits/oclock",lang); - if (!res) { - res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL); - } + res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL); break; case 'M': /* Minute */ |