update

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

diff --git a/conf/voicemail_en_tts.xml b/conf/voicemail_en_tts.xml
index e6d9dcd55a55f25a782a8b30fa8b5c01873c722f..3e88f98f30abb199974f175dde31cc07e2f45c01 100644 (file)
--- a/conf/voicemail_en_tts.xml
+++ b/conf/voicemail_en_tts.xml
@@ -50,7 +50,7 @@
   <macro name="voicemail_message_count">
     <input pattern="^([^:]+):([^:]+):{0,1}(.*)">
       <match>
-       <action function="speak-text" data="you have $1 $2 $3 messages in folder ${voicemail_current_folder}"/>
+       <action function="speak-text" data="you have $1 $2 message$3 in folder ${voicemail_current_folder}"/>
       </match>
     </input>
   </macro>

diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c
index 89abebe52be3766112eafec0bb43d0d731849c95..ffbfb183d389bff5247fe36a1bddebe5bc054d30 100644 (file)
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@@ -1037,13 +1037,13 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
                               &total_new_urgent_messages, &total_saved_urgent_messages);
 
                 if (total_new_urgent_messages > 0) {
-                    snprintf(msg_count, sizeof(msg_count), "%d:urgent:new", total_new_messages);
+                    snprintf(msg_count, sizeof(msg_count), "%d:urgent-new:%s", total_new_urgent_messages, total_new_urgent_messages == 1 ? "" : "s");
                     if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
                         goto end;
                     }
                 }
                 if (total_new_messages > 0) {
-                    snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages);
+                    snprintf(msg_count, sizeof(msg_count), "%d:new:%s", total_new_messages, total_new_messages == 1 ? "" : "s");
                     if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
                         goto end;
                     }
@@ -1057,14 +1057,14 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
                 }
                 
                 if (total_saved_urgent_messages > 0) {
-                    snprintf(msg_count, sizeof(msg_count), "%d:urgent:saved", total_saved_messages);
+                    snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved:%s", total_saved_urgent_messages, total_saved_urgent_messages == 1 ? "" : "s");
                     if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
                         goto end;
                     }
                 }
 
                 if (total_saved_messages > 0) {
-                    snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages);
+                    snprintf(msg_count, sizeof(msg_count), "%d:saved:%s", total_saved_messages, total_saved_messages == 1 ? "" : "s");
                     if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
                         goto end;
                     }
@@ -1509,6 +1509,9 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, char
             if (*profile->urgent_key == *input) {
                 read_flags = URGENT_FLAG_STRING;
                 priority = 1;
+                TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "marked-urgent", NULL, NULL));
+            } else {
+                TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL));
             }
         }