Author: anthm Date: Fri Oct 12 20:52:31 2007 New Revision: 5868 Modified: freeswitch/trunk/conf/voicemail_en_tts.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: update Modified: freeswitch/trunk/conf/voicemail_en_tts.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en_tts.xml (original) +++ freeswitch/trunk/conf/voicemail_en_tts.xml Fri Oct 12 20:52:31 2007 @@ -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> Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 12 20:52:31 2007 @@ -1037,13 +1037,13 @@ &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 @@ } 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 @@ 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)); } }