diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-23 10:30:05 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-23 10:30:05 +0000 |
| commit | a7ed41db69894a188e07b5b296b59ad5860673b5 (patch) | |
| tree | 964236ba830004bdf9455aa3b20359b9ad8389d6 | |
| parent | ee17118554a3c280b2331afcecb97c4908cd470b (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@295949 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/say.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/say.c b/main/say.c index ac2a8593d..a1b5a830f 100644 --- 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)); |