From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 25 May 2007 14:49:20 +0000 (+0000)
Subject: Merged revisions 66159 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe08532a4fb14a4d269d7cd8b877f50717c8fb0;p=thirdparty%2Fasterisk.git

Merged revisions 66159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r66159 | tilghman | 2007-05-25 09:41:27 -0500 (Fri, 25 May 2007) | 10 lines

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: https://origsvn.digium.com/svn/asterisk/trunk@66161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/say.c b/main/say.c
index c15f8f1989..582ffb2ec5 100644
--- a/main/say.c
+++ b/main/say.c
@@ -4779,32 +4779,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);