aboutsummaryrefslogtreecommitdiffstats
path: root/main/say.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-25 14:41:27 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-25 14:41:27 +0000
commit37856a60dd60ca2a77a4035bca6a7a89b8cd7134 (patch)
treecec7425ed6d68a5fdc4e30883a058dbebb96c8b0 /main/say.c
parent2638ef0c3bccf9d57cf28966bcfa43237af8a16e (diff)
Merged revisions 66127 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r66127 | tilghman | 2007-05-25 08:46:35 -0500 (Fri, 25 May 2007) | 2 lines Issue 9791 - Fix pronunciation of seconds in Dutch ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@66159 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/say.c')
-rw-r--r--main/say.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/main/say.c b/main/say.c
index e0491f2e9..62b315899 100644
--- a/main/say.c
+++ b/main/say.c
@@ -4633,32 +4633,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t time, const cha
break;
case 'S':
/* Seconds */
- if (tm.tm_sec == 0) {
- snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
- res = wait_file(chan,ints,nextmsg,lang);
- } else if (tm.tm_sec < 10) {
- res = wait_file(chan,ints, "digits/oh",lang);
- if (!res) {
- snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
- res = wait_file(chan,ints,nextmsg,lang);
- }
- } else if ((tm.tm_sec < 21) || (tm.tm_sec % 10 == 0)) {
- snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
- res = wait_file(chan,ints,nextmsg,lang);
- } else {
- int ten, one;
- ten = (tm.tm_sec / 10) * 10;
- one = (tm.tm_sec % 10);
- snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten);
- res = wait_file(chan,ints,nextmsg,lang);
- if (!res) {
- /* Fifty, not fifty-zero */
- if (one != 0) {
- snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
- res = wait_file(chan,ints,nextmsg,lang);
- }
- }
- }
+ res = ast_say_number(chan, tm.tm_sec, ints, lang, (char *) NULL);
break;
case 'T':
res = ast_say_date_with_format_nl(chan, time, ints, lang, "HMS", timezone);