Fix French time (bug #4197)
authorMark Spencer <markster@digium.com>
Sun, 8 May 2005 16:34:10 +0000 (16:34 +0000)
committerMark Spencer <markster@digium.com>
Sun, 8 May 2005 16:34:10 +0000 (16:34 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5598 65c4cc65-6c06-0410-ace0-fbb531ad65f3

say.c

diff --git a/say.c b/say.c
index 59d4344..40c1765 100755 (executable)
--- a/say.c
+++ b/say.c
@@ -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':