[svn-commits] oej: branch 1.8 r295949 - in /branches/1.8: ./ main/say.c

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Nov 23 04:30:05 2010
New Revision: 295949

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=295949
Log:
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/
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/say.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/say.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/say.c?view=diff&rev=295949&r1=295948&r2=295949
==============================================================================
--- branches/1.8/main/say.c (original)
+++ branches/1.8/main/say.c Tue Nov 23 04:30:05 2010
@@ -2221,15 +2221,15 @@
 		} 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));