Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv23877
Modified Files:
say.c
Log Message:
Fix French time (bug #4197)
Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- say.c 22 Apr 2005 13:11:34 -0000 1.57
+++ say.c 8 May 2005 16:34:10 -0000 1.58
@@ -3743,6 +3743,8 @@
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 @@
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':
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
