[svn-commits] lmadsen: branch 1.8 r281764 - in /branches/1.8: ./ configs/say.conf.sample

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Aug 11 12:55:00 CDT 2010 

Author: lmadsen
Date: Wed Aug 11 12:54:56 2010
New Revision: 281764

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

................
  r281763 | lmadsen | 2010-08-11 12:54:09 -0500 (Wed, 11 Aug 2010) | 14 lines
  
  Merged revisions 281762 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r281762 | lmadsen | 2010-08-11 12:51:40 -0500 (Wed, 11 Aug 2010) | 6 lines
    
    Allow say.conf to handle large numbers ending with multiple zeros.
    
    (closes issue #17833)
    Reported by: RoadKill
    Patches:
          say.conf.sample.patch.largenumbers uploaded by RoadKill (license 933)
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/configs/say.conf.sample

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Wed Aug 11 12:54:56 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763

Modified: branches/1.8/configs/say.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/say.conf.sample?view=diff&rev=281764&r1=281763&r2=281764
==============================================================================
--- branches/1.8/configs/say.conf.sample (original)
+++ branches/1.8/configs/say.conf.sample Wed Aug 11 12:54:56 2010
@@ -106,16 +106,25 @@
     _[n]um:X00 => num:${SAY:0:1}, digits/hundred
     _[n]um:XXX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
 
+    _[n]um:X000 => num:${SAY:0:1}, digits/thousand
     _[n]um:XXXX => num:${SAY:0:1}, digits/thousand, num:${SAY:1}
-    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XX000 => num:${SAY:0:2}, digits/thousand
+    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XXX000 => num:${SAY:0:3}, digits/thousand
     _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousand, num:${SAY:3}
 
+    _[n]um:X000000 => num:${SAY:0:1}, digits/million
     _[n]um:XXXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:XX000000 => num:${SAY:0:2}, digits/million
     _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/million, num:${SAY:2}
+    _[n]um:XXX000000 => num:${SAY:0:3}, digits/million
     _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/million, num:${SAY:3}
 
+    _[n]um:X000000000 => num:${SAY:0:1}, digits/billion
     _[n]um:XXXXXXXXXX => num:${SAY:0:1}, digits/billion, num:${SAY:1}
+    _[n]um:XX000000000 => num:${SAY:0:2}, digits/billion
     _[n]um:XXXXXXXXXXX => num:${SAY:0:2}, digits/billion, num:${SAY:2}
+    _[n]um:XXX000000000 => num:${SAY:0:3}, digits/billion
     _[n]um:XXXXXXXXXXXX => num:${SAY:0:3}, digits/billion, num:${SAY:3}
 
     ; enumeration
@@ -123,7 +132,8 @@
     _e[n]um:1X => digits/h-${SAY}
     _e[n]um:[2-9]0 => digits/h-${SAY}
     _e[n]um:[2-9][1-9] => num:${SAY:0:1}0, digits/h-${SAY:1}
-    _e[n]um:[1-9]XX => num:${SAY:0:1}, digits/hundred, enum:${SAY:1}
+    _e[n]um:[1-9]00 => num:${SAY:0:1}, digits/h-hundred
+    _e[n]um:[1-9]XX => num:${SAY:0:1}, digits/h-hundred, enum:${SAY:1}
 
 [en_GB](date-base,digit-base,en-base)
     _[n]um:XXX => num:${SAY:0:1}, digits/hundred, vm-and, num:${SAY:1}
@@ -139,15 +149,30 @@
     _[n]um:[2-9]00 => num:${SAY:0:1}, digits/hundred
     _[n]um:[2-9]XX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
 
+    _[n]um:1000 => digits/thousand
     _[n]um:1XXX => digits/thousand, num:${SAY:1}
+    _[n]um:[2-9]000 => num:${SAY:0:1}, digits/thousands
     _[n]um:[2-9]XXX => num:${SAY:0:1}, digits/thousands, num:${SAY:1}
+    _[n]um:XX000 => num:${SAY:0:2}, digits/thousands
     _[n]um:XXXXX => num:${SAY:0:2}, digits/thousands, num:${SAY:2}
+    _[n]um:XXX000 => num:${SAY:0:3}, digits/thousands
     _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousands, num:${SAY:3}
 
+    _[n]um:1000000 => num:${SAY:0:1}, digits/million
     _[n]um:1XXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:[2-9]000000 => num:${SAY:0:1}, digits/millions
     _[n]um:[2-9]XXXXXX => num:${SAY:0:1}, digits/millions, num:${SAY:1}
+    _[n]um:XX000000 => num:${SAY:0:2}, digits/millions
     _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/millions, num:${SAY:2}
+    _[n]um:XXX000000 => num:${SAY:0:3}, digits/millions
     _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/millions, num:${SAY:3}
+
+    _[n]um:X000000000 => num:${SAY:0:1}, digits/billion
+    _[n]um:XXXXXXXXXX => num:${SAY:0:1}, digits/billion, num:${SAY:1}
+    _[n]um:XX000000000 => num:${SAY:0:2}, digits/billion
+    _[n]um:XXXXXXXXXXX => num:${SAY:0:2}, digits/billion, num:${SAY:2}
+    _[n]um:XXX000000000 => num:${SAY:0:3}, digits/billion
+    _[n]um:XXXXXXXXXXXX => num:${SAY:0:3}, digits/billion, num:${SAY:3}
 
     _datetime::. => date:AdBY 'digits/at' IMp:${SAY}
     _date::. => date:AdBY:${SAY}
@@ -168,14 +193,23 @@
     _[n]um:1XX => digits/ein, digits/hundred, num:${SAY:1}
     _[n]um:[2-9]00 => digits/${SAY:0:1}, digits/hundred
     _[n]um:[2-9]XX => digits/${SAY:0:1}, digits/hundred, num:${SAY:1}
+
+    _[n]um:1000 => digits/ein, digits/thousand
     _[n]um:1XXX => digits/ein, digits/thousand, num:${SAY:1}
+    _[n]um:[2-9]000 => digits/${SAY:0:1}, digits/thousand
     _[n]um:[2-9]XXX => digits/${SAY:0:1}, digits/thousand, num:${SAY:1}
-    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
-    _[n]um:X00XXX => digits/${SAY:0:1}, digits/hundred, digits/thousand, num:${SAY:3}
-    _[n]um:XXXXXX => digits/${SAY:0:1}, digits/hundred, num:${SAY:1}
+    _[n]um:XX000 => num:${SAY:0:2}, digits/thousand
+    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XXX000 => num:${SAY:0:3}, digits/thousand
+    _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousand, num:${SAY:1}
+
+    _[n]um:1000000 => digits/eine, digits/million
     _[n]um:1XXXXXX => digits/eine, digits/million, num:${SAY:1}
+    _[n]um:[2-9]000000 => digits/${SAY:0:1}, digits/millions
     _[n]um:[2-9]XXXXXX => digits/${SAY:0:1}, digits/millions, num:${SAY:1}
+    _[n]um:XX000000 => num:${SAY:0:2}, digits/millions
     _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/millions, num:${SAY:2}
+    _[n]um:XXX000000 => num:${SAY:0:3}, digits/millions
     _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/millions, num:${SAY:3}
 
     _datetime::. => date:AdBY 'digits/at' IMp:${SAY}
@@ -191,16 +225,25 @@
     _[n]um:[3-9][1-9] =>  digits/${SAY:0:1}0, num:${SAY:1}
     _[n]um:XXX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
 
+    _[n]um:X000 => num:${SAY:0:1}, digits/thousand
     _[n]um:XXXX => num:${SAY:0:1}, digits/thousand, num:${SAY:1}
-    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XX000 => num:${SAY:0:2}, digits/thousand
+    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XXX000 => num:${SAY:0:3}, digits/thousand
     _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousand, num:${SAY:3}
 
+    _[n]um:X000000 => num:${SAY:0:1}, digits/million
     _[n]um:XXXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:XX000000 => num:${SAY:0:2}, digits/million
     _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/million, num:${SAY:2}
+    _[n]um:XXX000000 => num:${SAY:0:3}, digits/million
     _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/million, num:${SAY:3}
 
+    _[n]um:X000000000 => num:${SAY:0:1}, digits/billion
     _[n]um:XXXXXXXXXX => num:${SAY:0:1}, digits/billion, num:${SAY:1}
+    _[n]um:XX000000000 => num:${SAY:0:2}, digits/billion
     _[n]um:XXXXXXXXXXX => num:${SAY:0:2}, digits/billion, num:${SAY:2}
+    _[n]um:XXX000000000 => num:${SAY:0:3}, digits/billion
     _[n]um:XXXXXXXXXXXX => num:${SAY:0:3}, digits/billion, num:${SAY:3}
 
     _datetime::. => date:YBdA k 'ora' M 'perc':${SAY}
@@ -222,14 +265,22 @@
     _[n]um:[2-9]00 => num:${SAY:0:1}, digits/hundred
     _[n]um:[2-9]XX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
     
+    _[n]um:1000 => digits/thousand
     _[n]um:1XXX => digits/thousand, num:${SAY:1}
+    _[n]um:[2-9]000 => num:${SAY:0:1}, digits/thousand
     _[n]um:[2-9]XXX => num:${SAY:0:1}, digits/thousand, num:${SAY:1}
-    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XX000 => num:${SAY:0:2}, digits/thousand
+    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XXX000 => num:${SAY:0:3}, digits/thousand
     _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousand, num:${SAY:3}
     
+    _[n]um:1000000 => num:${SAY:0:1}, digits/million
     _[n]um:1XXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:[2-9]000000 => num:${SAY:0:1}, digits/million
     _[n]um:[2-9]XXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:XX000000 => num:${SAY:0:2}, digits/million
     _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/million, num:${SAY:2}
+    _[n]um:XXX000000 => num:${SAY:0:3}, digits/million
     _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/million, num:${SAY:3}
     
     _datetime::. => date:AdBY 'digits/at' H 'hours' M 'perc':${SAY}

More information about the svn-commits mailing list