[svn-commits] oej: trunk r295950 - in /trunk: ./ main/say.c

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Nov 23 04:34:17 2010
New Revision: 295950

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=295950
Log:
Merged revisions 295949 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295949 | oej | 2010-11-23 11:30:05 +0100 (Tis, 23 Nov 2010) | 21 lines
  
  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:
    trunk/   (props changed)
    trunk/main/say.c

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

Modified: trunk/main/say.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/say.c?view=diff&rev=295950&r1=295949&r2=295950
==============================================================================
--- trunk/main/say.c (original)
+++ trunk/main/say.c Tue Nov 23 04:34:17 2010
@@ -2231,15 +2231,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));