From 45a92ba5c2963c4d2b19999578e1be2accad40ed Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sun, 8 May 2005 16:34:10 +0000
Subject: [PATCH] Fix French time (bug #4197)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
say.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/say.c b/say.c
index 59d4344fee..40c17659bd 100755
--- 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':
--
GitLab