From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 28 Sep 2007 14:13:47 +0000 (+0000)
Subject: Correct pronunciations of numbers for .nl (Closes issue #10837)
X-Git-Tag: 1.4.12~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1f26cfcdf664f04bc549765837ef61afd9b1467;p=thirdparty%2Fasterisk.git

Correct pronunciations of numbers for .nl (Closes issue #10837)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/say.c b/main/say.c
index e0282f84f3..38f6a5d3ac 100644
--- a/main/say.c
+++ b/main/say.c
@@ -1506,21 +1506,35 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char
 				snprintf(fn, sizeof(fn), "digits/%d", num - units);
 				num = 0;
 			}
+		} else if (num < 200) {
+			/* hundred, not one-hundred */
+			ast_copy_string(fn, "digits/hundred", sizeof(fn));
+			num -= ((num / 100) * 100);
+		} else if (num < 1000) {
+			snprintf(fn, sizeof(fn), "digits/%d", num / 100);
+			playh++;
+			num -= ((num / 100) * 100);
 		} else {
-			if (num < 1000) {
-				snprintf(fn, sizeof(fn), "digits/%d", (num/100));
-				playh++;
-				num -= ((num / 100) * 100);
+			if (num < 1100) {
+				/* thousand, not one-thousand */
+				num = num % 1000;
+				ast_copy_string(fn, "digits/thousand", sizeof(fn));
+			} else if (num < 10000)	{ /* 1,100 to 9,9999 */
+				res = ast_say_number_full_nl(chan, num / 100, ints, language, audiofd, ctrlfd);
+				if (res)
+					return res;
+				num = num % 100;
+				ast_copy_string(fn, "digits/hundred", sizeof(fn));
 			} else {
 				if (num < 1000000) { /* 1,000,000 */
-					res = ast_say_number_full_en(chan, num / 1000, ints, language, audiofd, ctrlfd);
+					res = ast_say_number_full_nl(chan, num / 1000, ints, language, audiofd, ctrlfd);
 					if (res)
 						return res;
 					num = num % 1000;
 					snprintf(fn, sizeof(fn), "digits/thousand");
 				} else {
 					if (num < 1000000000) { /* 1,000,000,000 */
-						res = ast_say_number_full_en(chan, num / 1000000, ints, language, audiofd, ctrlfd);
+						res = ast_say_number_full_nl(chan, num / 1000000, ints, language, audiofd, ctrlfd);
 						if (res)
 							return res;
 						num = num % 1000000;