[svn-commits] tilghman: trunk r274418 - in /trunk: ./ configs/say.conf.sample

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jul  7 01:15:43 2010
New Revision: 274418

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

........
  r274417 | tilghman | 2010-07-07 01:13:54 -0500 (Wed, 07 Jul 2010) | 8 lines
  
  Correct how 100, 200, 300, etc. is said.  Also add the crazy British numbers.
  
  (closes issue #16102)
   Reported by: Delvar
   Patches: 
         say.conf.fix.patch uploaded by Delvar (license 908)
         (plus a few additional fixes and simplifications by me)
........

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

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

Modified: trunk/configs/say.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/say.conf.sample?view=diff&rev=274418&r1=274417&r2=274418
==============================================================================
--- trunk/configs/say.conf.sample (original)
+++ trunk/configs/say.conf.sample Wed Jul  7 01:15:43 2010
@@ -103,6 +103,7 @@
     _[n]um:1X => digits/${SAY}
     _[n]um:[2-9]0 =>  digits/${SAY}
     _[n]um:[2-9][1-9] =>  digits/${SAY:0:1}0, num:${SAY:1}
+    _[n]um:X00 => num:${SAY:0:1}, digits/hundred
     _[n]um:XXX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
 
     _[n]um:XXXX => num:${SAY:0:1}, digits/thousand, num:${SAY:1}
@@ -124,13 +125,18 @@
     _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}
 
+[en_GB](date-base,digit-base,en-base)
+    _[n]um:XXX => num:${SAY:0:1}, digits/hundred, vm-and, num:${SAY:1}
+
 [it](digit-base,date-base)
     _[n]um:0. => num:${SAY:1}
     _[n]um:X => digits/${SAY}
     _[n]um:1X => digits/${SAY}
     _[n]um:[2-9]0 =>  digits/${SAY}
     _[n]um:[2-9][1-9] =>  digits/${SAY:0:1}0, num:${SAY:1}
+    _[n]um:100 => digits/hundred
     _[n]um:1XX => digits/hundred, num:${SAY:1}
+    _[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:1XXX => digits/thousand, num:${SAY:1}
@@ -158,7 +164,9 @@
     _[n]um:1X => digits/${SAY}
     _[n]um:[2-9]0 => digits/${SAY}
     _[n]um:[2-9][1-9] => digits/${SAY:1}-and, digits/${SAY:0:1}0
+    _[n]um:100 => digits/ein, digits/hundred
     _[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:1XXX => digits/ein, digits/thousand, num:${SAY:1}
     _[n]um:[2-9]XXX => digits/${SAY:0:1}, digits/thousand, num:${SAY:1}
@@ -211,6 +219,7 @@
     _[n]um:[2-9][1-9] =>  digits/${SAY:0:1}0, num:${SAY:1}
     _[n]um:100 => digits/hundred
     _[n]um:1XX => digits/hundred, num:${SAY:1}
+    _[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:1XXX => digits/thousand, num:${SAY:1}