fix voicemail macros

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6765 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/lang/en/vm/sounds.xml b/conf/lang/en/vm/sounds.xml
index 0338d619ec27ab757b4b9bb45086b62f034a1a72..d8def419181bfc5cc98723678f3b72ee41d37491 100644 (file)
--- a/conf/lang/en/vm/sounds.xml
+++ b/conf/lang/en/vm/sounds.xml
@@ -54,7 +54,7 @@
       <match>
        <action function="play-file" data="voicemail/vm-you_have.wav"/>
        <action function="say" data="1" method="pronounced" type="items"/>
-       <action function="play-file" data="voicemail/vm-$2.wav"/> 
+       <action function="play-file" data="voicemail/vm-new.wav"/> 
        <action function="play-file" data="voicemail/vm-message.wav"/>
        <action function="play-file" data="voicemail/vm-in_folder.wav"/>
       </match>
@@ -147,23 +147,23 @@
   </macro>
 
   <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-       <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$1" method="pronounced" type="name_spelled"/>
        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
        <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+       <action function="say" data="$1" method="pronounced" type="name_spelled"/>
        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
        <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+       <action function="say" data="$2" method="pronounced" type="name_spelled"/>
        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
        <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$4" method="pronounced" type="name_spelled"/>
+       <action function="say" data="$3" method="pronounced" type="name_spelled"/>
        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
        <action function="play-file" data="voicemail/vm-press.wav"/>
        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+       <action function="play-file" data="voicemail/vm-press.wav"/>
+       <action function="say" data="$5" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -200,23 +200,6 @@
     </input>
   </macro>
 
-  <macro name="marked-urgent">
-    <input pattern="^(.*)$">
-      <match>
-       <action function="play-file" data="voicemail/vm-urgent.wav"/>
-       <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="saved">
-    <input pattern="^(.*)$">
-      <match>
-       <action function="play-file" data="voicemail/vm-saved.wav"/>
-      </match>
-    </input>
-  </macro>
-
   <macro name="voicemail_greeting_selected">
     <input pattern="^(.*)$">
       <match>
@@ -269,20 +252,38 @@
       </match>
     </input>
   </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
+  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
+  <macro name="voicemail_ack"> 
+    <input pattern="^(deleted)$">
+      <match>
+       <action function="play-file" data="voicemail/vm-message.wav"/>
+       <action function="play-file" data="voicemail/vm-$1.wav"/>
+      </match>
+    </input>
+    <input pattern="^(saved)$">
       <match>
        <action function="play-file" data="voicemail/vm-message.wav"/>
        <action function="play-file" data="voicemail/vm-$1.wav"/>
       </match>
     </input>
+    <input pattern="^(emailed)$">
+      <match>
+       <action function="play-file" data="voicemail/vm-message.wav"/>
+       <action function="play-file" data="voicemail/vm-saved.wav"/>
+      </match>
+    </input>
+    <input pattern="^(marked-urgent)$">
+      <match>
+       <action function="play-file" data="voicemail/vm-message.wav"/>
+       <action function="play-file" data="voicemail/vm-saved.wav"/>
+      </match>
+    </input>
   </macro>
 
   <macro name="voicemail_say_date">
     <input pattern="^(.*)$">
       <match>
-       <action function="say" data="$strftime($1|%A, %B %d %Y, %I %M %p)" method="pronounced" type="current_date_time"/>
+       <action function="say" data="$1" method="pronounced" type="current_date_time"/>
       </match>
     </input>
   </macro>