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

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Aug 11 16:12:13 2010
New Revision: 281875

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

................
  r281873 | lmadsen | 2010-08-11 16:09:47 -0500 (Wed, 11 Aug 2010) | 14 lines
  
  Merged revisions 281819 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r281819 | lmadsen | 2010-08-11 13:28:10 -0500 (Wed, 11 Aug 2010) | 6 lines
    
    Add Danish support to say.conf.sample
    
    (closes issue #17836)
    Reported by: RoadKill
    Patches:
          say.conf.sample.patch.dk 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 16:12:13 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,281763
+/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,281873

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=281875&r1=281874&r2=281875
==============================================================================
--- branches/1.8/configs/say.conf.sample (original)
+++ branches/1.8/configs/say.conf.sample Wed Aug 11 16:12:13 2010
@@ -327,3 +327,50 @@
     _date::. => date:Ad 'letters/d' B 'letters/d' Y:${SAY}
     _time::. => date:HMp:${SAY}
 
+[da](date-base,digit-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:1}-and, digits/${SAY:0:1}0
+    _[n]um:100 => digits/1N, digits/hundred
+    _[n]um:1XX => digits/1N, 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/1N, digits/thousand
+    _[n]um:1XXX => digits/1N, 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: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 => digits/${SAY:0:1}, digits/million
+    _[n]um:XXXXXXX => digits/${SAY:0:1}, digits/million, 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' kM:${SAY}
+    _date::. => date:AdBY:${SAY}
+    _time::. => date:HM:${SAY}
+
+    ; enumeration
+    _e[n]um:X => digits/h-${SAY}
+    _e[n]um:1X => digits/h-${SAY}
+    _e[n]um:[2-9]0 => digits/h-${SAY}
+    _e[n]um:[2-9][1-9] => digits/${SAY:1}-and, digits/h-${SAY:0:1}0
+    _e[n]um:100 => digits/1N, digits/h-hundred
+    _e[n]um:1XX => digits/1N, digits/h-hundred, enum:${SAY:1}
+    _e[n]um:[2-9]00 => num:${SAY:0:1}, digits/h-hundred
+    _e[n]um:[2-9]XX => num:${SAY:0:1}, digits/h-hundred, enum:${SAY:1}