diff options
author | Mark Spencer <markster@digium.com> | 2005-05-08 16:34:10 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-05-08 16:34:10 +0000 |
commit | 45a92ba5c2963c4d2b19999578e1be2accad40ed (patch) | |
tree | 4e8323c7ecd8139b41c356afae626030f00138e3 | |
parent | 7e83b3a4b109eca0f04967d8d325ebbc7627589d (diff) |
Fix French time (bug #4197)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | say.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -3743,6 +3743,8 @@ int ast_say_date_with_format_fr(struct ast_channel *chan, time_t time, const cha else snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour); res = wait_file(chan,ints,nextmsg,lang); + if (!res) + res = wait_file(chan,ints, "digits/oclock",lang); break; case 'H': case 'k': @@ -3753,13 +3755,15 @@ int ast_say_date_with_format_fr(struct ast_channel *chan, time_t time, const cha res = wait_file(chan,ints, "digits/oclock",lang); } } + if (!res) + res = wait_file(chan,ints, "digits/oclock",lang); break; case 'M': /* Minute */ - res = wait_file(chan,ints, "digits/oclock",lang); - if (res) break; - if (tm.tm_min == 0) break; - res = ast_say_number(chan, tm.tm_hour, ints, lang, (char * ) NULL); + if (tm.tm_min == 0) { + break; + } + res = ast_say_number(chan, tm.tm_min, ints, lang, (char * ) NULL); break; case 'P': case 'p': |