aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-23 09:36:38 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-23 09:36:38 +0000
commite78bf4a3087a9f84b95d92ce6e13b8796e7efacb (patch)
treeb6b1f20b72ca5423b5584b7d64aa3eef853c7320 /main
parent1fb849ac65111829d2a7ca95b707014dab1a0c35 (diff)
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.6.2@295907 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/say.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/say.c b/main/say.c
index 9ff16b875..a669a9726 100644
--- a/main/say.c
+++ b/main/say.c
@@ -2213,15 +2213,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));