kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5868 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-10-13 00:52:31 +00:00
parent e6d08bcc06
commit 5f9f6ac05b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/voicemail_en_tts.xml
View File

@ -50,7 +50,7 @@
<macro name="voicemail_message_count"> <macro name="voicemail_message_count">
<input pattern="^([^:]+):([^:]+):{0,1}(.*)"> <input pattern="^([^:]+):([^:]+):{0,1}(.*)">
<match> <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> </match>
</input> </input>
</macro> </macro>

11
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -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); &total_new_urgent_messages, &total_saved_urgent_messages);
if (total_new_urgent_messages > 0) { 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) { if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end; goto end;
} }
} }
if (total_new_messages > 0) { 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) { if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end; 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) { 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) { if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end; goto end;
} }
} }
if (total_saved_messages > 0) { 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) { if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end; goto end;
} }
@ -1509,6 +1509,9 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, char
if (*profile->urgent_key == *input) { if (*profile->urgent_key == *input) {
read_flags = URGENT_FLAG_STRING; read_flags = URGENT_FLAG_STRING;
priority = 1; 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));
} }
} }