Merged revisions 295907 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r295907 | oej | 2010-11-23 10:36:38 +0100 (Tis, 23 Nov 2010) | 14 lines

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

  ........
    r295906 | oej | 2010-11-23 10:28:14 +0100 (Tis, 23 Nov 2010) | 8 lines

    Fix support of saynumber(1,n) in the Swedish language

    (closes issue #18353)
    Reported by: oej

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

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

diff --git a/main/say.c b/main/say.c
index ac2a8593d388d1b5e669da7fd8b722feaf337312..a1b5a830fde9cd6d6ccd075395ef9be1b7c6ab78 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -2221,15 +2221,15 @@ static int ast_say_number_full_se(struct ast_channel *chan, int num, const char
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
+               } else if (num == 1 && cn == -1) {      /* En eller ett? */
+                       ast_copy_string(fn, "digits/1N", sizeof(fn));
+                       num = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
                } else if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
                        num %= 10;
-               } else if (num == 1 && cn == -1) {      /* En eller ett? */
-                       ast_copy_string(fn, "digits/1N", sizeof(fn));
-                       num = 0;
                } else {
                        if (num < 1000){
                                snprintf(fn, sizeof(fn), "digits/%d", (num/100));