[asterisk-commits] tilghman: trunk r66161 - in /trunk: ./ main/say.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Fri May 25 09:49:20 2007
New Revision: 66161

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66161
Log:
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

........

................

Modified:
    trunk/   (props changed)
    trunk/main/say.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/say.c
URL: http://svn.digium.com/view/asterisk/trunk/main/say.c?view=diff&rev=66161&r1=66160&r2=66161
==============================================================================
--- trunk/main/say.c (original)
+++ trunk/main/say.c Fri May 25 09:49:20 2007
@@ -4779,32 +4779,7 @@
 				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);