Fix bugs in saying numbers using the Swedish language syntax

(closes issue #18355)
Reported by: oej
Patch by: oej

Much help from Peter Lindahl. Testing by the ClearIT team during a coffee break.

Review: https://reviewboard.asterisk.org/r/1033/

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

diff --git a/main/say.c b/main/say.c
index 6b3fce9b00bc8e12b64eb2d8c0295a0df5eb7b5a..c15900e9d273d1db686417ba47aa26f39027d1ed 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -2099,76 +2099,83 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
        return res;
 }
 
+
 /*! \brief  ast_say_number_full_se: Swedish syntax */
 static int ast_say_number_full_se(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       int res = 0;
        int playh = 0;
+       int start = 1;
        char fn[256] = "";
        int cn = 1;             /* +1 = commune; -1 = neuter */
+       int res = 0;
+
        if (!num) 
                return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
        if (options && !strncasecmp(options, "n",1)) cn = -1;
 
-       while (!res && (num || playh)) {
+       while (num || playh) {
                if (num < 0) {
                        snprintf(fn, sizeof(fn), "digits/minus");
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        snprintf(fn, sizeof(fn), "digits/hundred");
                        playh = 0;
+               } else if (start  && num < 200 && num > 99 && cn == -1) {
+                       /* Don't say "en hundra" just say "hundra". */
+                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       num -= 100;
                } else if (num == 1 && cn == -1) {      /* En eller ett? */
                        snprintf(fn, sizeof(fn), "digits/1N");
                        num = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
-               } else if (num < 100) {
+               } else if (num < 100) { /* Below hundreds - teens and tens */
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
                        num -= ((num / 10) * 10);
-               } else {
-                       if (num < 1000){
-                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));
-                               playh++;
-                               num -= ((num / 100) * 100);
-                       } else {
-                               if (num < 1000000) { /* 1,000,000 */
-                                       res = ast_say_number_full_se(chan, num / 1000, ints, language, options, 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_se(chan, num / 1000000, ints, language, options, audiofd, ctrlfd);
-                                               if (res) {
-                                                       return res;
-                                               }
-                                               num = num % 1000000;
-                                               snprintf(fn, sizeof(fn), "digits/million");
-                                       } else {
-                                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
-                                               res = -1;
-                                       }
-                               }
+               } else if (num < 1000) {
+                       /* Hundreds */
+                       snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+                       playh++;
+                       num -= ((num / 100) * 100);
+               } else if (num < 1000000) { /* 1,000,000 */
+                       /* Always say "ett hundra tusen", not "en hundra tusen" */
+                       res = ast_say_number_full_se(chan, num / 1000, ints, language, "c", audiofd, ctrlfd);
+                       if (res) {
+                               return res;
+                       }
+                       num = num % 1000;
+                       snprintf(fn, sizeof(fn), "digits/thousand");
+               } else if (num < 1000000000) {  /* 1,000,000,000 */
+                       /* Always say "en miljon", not "ett miljon" */
+                       res = ast_say_number_full_se(chan, num / 1000000, ints, language, "n", audiofd, ctrlfd);
+                       if (res) {
+                               return res;
                        }
+                       num = num % 1000000;
+                       snprintf(fn, sizeof(fn), "digits/million");
+               } else {        /* Miljarder - Billions */
+                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       return -1;
                }
-               if (!res) {
-                       if (!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1))
-                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else
-                                       res = ast_waitstream(chan, ints);
-                               ast_stopstream(chan);
+
+               if (!ast_streamfile(chan, fn, language)) {
+                       if ((audiofd > -1) && (ctrlfd > -1))
+                               res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                       else
+                               res = ast_waitstream(chan, ints);
+                       ast_stopstream(chan);
+                       if (res) {
+                               return res;
                        }
                }
+               start = 0;
        }
-       return res;
+       return 0;
 }
 
 /*! \brief  ast_say_number_full_zh: Taiwanese / Chinese syntax */