[asterisk-commits] lmadsen: trunk r284319 - in /trunk: ./ configs/say.conf.sample

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Aug 31 14:01:12 2010
New Revision: 284319

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

................
  r284318 | lmadsen | 2010-08-31 14:00:15 -0500 (Tue, 31 Aug 2010) | 22 lines
  
  Merged revisions 284317 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r284317 | lmadsen | 2010-08-31 13:59:31 -0500 (Tue, 31 Aug 2010) | 15 lines
    
    Merged revisions 284316 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r284316 | lmadsen | 2010-08-31 13:57:59 -0500 (Tue, 31 Aug 2010) | 7 lines
      
      Update say.conf.sample to match the rules in say.c
      
      (closes issue #17835)
      Reported by: RoadKill
      Patches:
            say.conf.sample.patch.rules uploaded by RoadKill (license 933)
      Tested by: RoadKill
    ........
  ................
................

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-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=284319&r1=284318&r2=284319
==============================================================================
--- trunk/configs/say.conf.sample (original)
+++ trunk/configs/say.conf.sample Tue Aug 31 14:01:12 2010
@@ -86,16 +86,23 @@
     ; the 'SAY' variable contains YYYYMMDDHHmm.ss-dow-doy
     ; these rule map the strftime attributes.
     _date:Y:. => num:${SAY:0:4}	; year, 19xx
-    _date:[Bb]:. => digits/mon-$[${SAY:4:2}-1]	; month name, 0..11
+    _date:[Bbh]:. => digits/mon-$[${SAY:4:2}-1]			; month name, 0..11
     _date:[Aa]:. => digits/day-${SAY:16:1}	; day of week
     _date:[de]:. => num:${SAY:6:2}		; day of month
-    _date:[hH]:. => num:${SAY:8:2}		; hour
+    _date:[H]:. => digits/oh, num:${SAY:8:2}			; hour (oh one, oh two, ..., oh nine, ten, eleven, ..., twenty-three)
     _date:[I]:. => num:$[${SAY:8:2} % 12]	; hour 0-12
     _date:[M]:. => num:${SAY:10:2}		; minute
     ; XXX too bad the '?' function does not remove the quotes
     ; _date:[pP]:. => digits/$[ ${SAY:10:2} > 12 ? "p-m" :: "a-m"]	; am pm
     _date:[pP]:. => digits/p-m	; am pm
     _date:[S]:. => num:${SAY:13:2}		; seconds
+    _date:[Ii]:. => num:$[${SAY:8:2} % 12]			; hour 0-12
+    _date:[k]:. => num:${SAY:8:2}				; hour (one, two. three, ...,twenty three
+    _date:[m]:. => num:${SAY:4:2}				; month number
+    _date:[Q]:. => date:dby ;incompleat				; "today", "yesterday" or ABdY
+    _date:[q]:. => date:dby ;incompleat				; "" (for today), "yesterday", weekday, or ABdY
+    _date:[R]:. => date:HM${SAY}				; 24 hour time, including minute
+    _date:[T]:. => date:HMS${SAY}				; 24 hour, minure, seconds
 
 [en-base](!)
     _[n]um:0. => num:${SAY:1}