say.conf: fix 12pm noon logic

Fixes 12pm noon incorrectly returning 0/a.m.
Also fixes a misspelling typo in the config.

ASTERISK-29695 #close

Change-Id: Ie40f9618636eb4c483b449bd707a5dcffca5c406

diff --git a/configs/samples/say.conf.sample b/configs/samples/say.conf.sample
index de35ee4a6afe7a87e8e0a91dd0937739dcb78054..4cab590b8f394144e46a5351980ea6973cf34c61 100644 (file)
--- a/configs/samples/say.conf.sample
+++ b/configs/samples/say.conf.sample
@@ -90,17 +90,17 @@ mode=old    ; method for playing numbers and dates
     _date:[Aa]:. => digits/day-${SAY:16:1}     ; day of week
     _date:[de]:. => num:${SAY:6:2}             ; day of month
     _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:[I]:. => num:${IF($[${SAY:8:2} > 12] ? $[${SAY:8:2}%12] : ${SAY:8:2})}       ; 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/$[ ${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:[Q]:. => date:dby ;incomplete                                ; "today", "yesterday" or ABdY
+    _date:[q]:. => date:dby ;incomplete                                ; "" (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