dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[vm] Split new/saved message count macros + improve french translations (#6944) 

* [vm] Split new/saved message count macros + fix french translations

* Update main_menu.lua
This commit is contained in:
emak-Corey 2024-04-15 11:32:13 -04:00 committed by GitHub
parent 4435cf5bd0
commit 27b2ddb906
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 305 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/switch/resources/conf/languages/ar/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/de/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/el/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/en/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/es/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/fr/vm/sounds.xml
View File

@ -66,7 +66,7 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>
@ -85,6 +85,25 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
<action function="play-file" data="voicemail/vm-$2.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
<action function="play-file" data="voicemail/vm-$2.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_menu"> <macro name="voicemail_menu">
<input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
<match> <match>

3
app/switch/resources/conf/languages/fr/vm/voicemail.xml
View File

@ -48,9 +48,6 @@
<action function="play-file" data="voicemail/vm-save_recording.wav"/> <action function="play-file" data="voicemail/vm-save_recording.wav"/>
<action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/>
<action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="say" data="$2" method="pronounced" type="name_spelled"/>
<action function="play-file" data="voicemail/vm-message_envelope.wav"/>
<action function="play-file" data="voicemail/vm-press.wav"/>
<action function="say" data="$3" method="pronounced" type="name_spelled"/>
<action function="play-file" data="voicemail/vm-return_call.wav"/> <action function="play-file" data="voicemail/vm-return_call.wav"/>
<action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/>
<action function="say" data="$4" method="pronounced" type="name_spelled"/> <action function="say" data="$4" method="pronounced" type="name_spelled"/>

21
app/switch/resources/conf/languages/he/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/it/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/nl/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/pt/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/ro/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/ru/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

24
app/switch/resources/conf/languages/sv/vm/sounds.xml
View File

@ -74,7 +74,29 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>-->
<action function="play-file" data="voicemail/vm-du_har.wav"/>
<action function="play-file" data="voicemail/vm-inga.wav"/>
<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<!--<action function="play-file" data="voicemail/vm-you_have.wav"/>--> <!--<action function="play-file" data="voicemail/vm-you_have.wav"/>-->

21
app/switch/resources/conf/languages/tr/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

21
app/switch/resources/conf/languages/uk/vm/sounds.xml
View File

@ -66,7 +66,26 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_message_count"> <macro name="voicemail_new_message_count">
<input pattern="^(1):(.*)$" break_on_match="true">
<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-message.wav"/>
</match>
</input>
<input pattern="^(\d+):(.*)$">
<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-messages.wav"/>
</match>
</input>
</macro>
<macro name="voicemail_saved_message_count">
<input pattern="^(1):(.*)$" break_on_match="true"> <input pattern="^(1):(.*)$" break_on_match="true">
<match> <match>
<action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="play-file" data="voicemail/vm-you_have.wav"/>

4
app/switch/resources/scripts/app/voicemail/resources/functions/main_menu.lua
View File

@ -51,7 +51,7 @@
dbh:query(sql, params, function(row) dbh:query(sql, params, function(row)
new_messages = row["new_messages"]; new_messages = row["new_messages"];
end); end);
dtmf_digits = session:playAndGetDigits(0, 1, 1, 300, "#", "phrase:voicemail_message_count:" .. new_messages .. ":new", "", "\\d+"); dtmf_digits = session:playAndGetDigits(0, 1, 1, 300, "#", "phrase:voicemail_new_message_count:" .. new_messages .. ":new", "", "\\d+");
end end
--saved voicemail count --saved voicemail count
if (session:ready()) then if (session:ready()) then
@ -67,7 +67,7 @@
dbh:query(sql, params, function(row) dbh:query(sql, params, function(row)
saved_messages = row["saved_messages"]; saved_messages = row["saved_messages"];
end); end);
dtmf_digits = session:playAndGetDigits(0, 1, 1, 300, "#", "phrase:voicemail_message_count:" .. saved_messages .. ":saved", "", "\\d+"); dtmf_digits = session:playAndGetDigits(0, 1, 1, 300, "#", "phrase:voicemail_saved_message_count:" .. saved_messages .. ":saved", "", "\\d+");
end end
end end