From 27b2ddb906ede5848a7e8c9b666c7388422dee25 Mon Sep 17 00:00:00 2001
From: emak-Corey <corey@emak.tech>
Date: Mon, 15 Apr 2024 11:32:13 -0400
Subject: [PATCH] [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
---
 .../resources/conf/languages/ar/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/de/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/el/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/en/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/es/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/fr/vm/sounds.xml | 21 +++++++++++++++-
 .../conf/languages/fr/vm/voicemail.xml        |  3 ---
 .../resources/conf/languages/he/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/it/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/nl/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/pt/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/ro/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/ru/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/sv/vm/sounds.xml | 24 ++++++++++++++++++-
 .../resources/conf/languages/tr/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/conf/languages/uk/vm/sounds.xml | 21 +++++++++++++++-
 .../resources/functions/main_menu.lua         |  4 ++--
 17 files changed, 305 insertions(+), 20 deletions(-)

diff --git a/app/switch/resources/conf/languages/ar/vm/sounds.xml b/app/switch/resources/conf/languages/ar/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/ar/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/ar/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/de/vm/sounds.xml b/app/switch/resources/conf/languages/de/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/de/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/de/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/el/vm/sounds.xml b/app/switch/resources/conf/languages/el/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/el/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/el/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/en/vm/sounds.xml b/app/switch/resources/conf/languages/en/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/en/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/en/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/es/vm/sounds.xml b/app/switch/resources/conf/languages/es/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/es/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/es/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/fr/vm/sounds.xml b/app/switch/resources/conf/languages/fr/vm/sounds.xml
index dd1e0b97f4..4e77210426 100644
--- a/app/switch/resources/conf/languages/fr/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/fr/vm/sounds.xml
@@ -66,7 +66,7 @@
     </input>
   </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"/>
@@ -85,6 +85,25 @@
     </input>
   </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">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
diff --git a/app/switch/resources/conf/languages/fr/vm/voicemail.xml b/app/switch/resources/conf/languages/fr/vm/voicemail.xml
index 2ed7313489..273d28dd35 100644
--- a/app/switch/resources/conf/languages/fr/vm/voicemail.xml
+++ b/app/switch/resources/conf/languages/fr/vm/voicemail.xml
@@ -48,9 +48,6 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <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-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
diff --git a/app/switch/resources/conf/languages/he/vm/sounds.xml b/app/switch/resources/conf/languages/he/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/he/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/he/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/it/vm/sounds.xml b/app/switch/resources/conf/languages/it/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/it/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/it/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/nl/vm/sounds.xml b/app/switch/resources/conf/languages/nl/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/nl/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/nl/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/pt/vm/sounds.xml b/app/switch/resources/conf/languages/pt/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/pt/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/pt/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/ro/vm/sounds.xml b/app/switch/resources/conf/languages/ro/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/ro/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/ro/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/ru/vm/sounds.xml b/app/switch/resources/conf/languages/ru/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/ru/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/ru/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/sv/vm/sounds.xml b/app/switch/resources/conf/languages/sv/vm/sounds.xml
index b088de874b..9706d7a5d8 100644
--- a/app/switch/resources/conf/languages/sv/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/sv/vm/sounds.xml
@@ -74,7 +74,29 @@
     </input>
   </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">
       <match>
         <!--<action function="play-file" data="voicemail/vm-you_have.wav"/>-->
diff --git a/app/switch/resources/conf/languages/tr/vm/sounds.xml b/app/switch/resources/conf/languages/tr/vm/sounds.xml
index dd1e0b97f4..250cb96e1d 100644
--- a/app/switch/resources/conf/languages/tr/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/tr/vm/sounds.xml
@@ -66,7 +66,26 @@
     </input>
   </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">
       <match>
         <action function="play-file" data="voicemail/vm-you_have.wav"/>
diff --git a/app/switch/resources/conf/languages/uk/vm/sounds.xml b/app/switch/resources/conf/languages/uk/vm/sounds.xml
index dd1e0b97f4..55cfb91776 100644
--- a/app/switch/resources/conf/languages/uk/vm/sounds.xml
+++ b/app/switch/resources/conf/languages/uk/vm/sounds.xml
@@ -66,7 +66,7 @@
     </input>
   </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"/>
@@ -85,6 +85,25 @@
     </input>
   </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-$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_menu">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
diff --git a/app/switch/resources/scripts/app/voicemail/resources/functions/main_menu.lua b/app/switch/resources/scripts/app/voicemail/resources/functions/main_menu.lua
index cbaadc4dbf..c69593b248 100644
--- a/app/switch/resources/scripts/app/voicemail/resources/functions/main_menu.lua
+++ b/app/switch/resources/scripts/app/voicemail/resources/functions/main_menu.lua
@@ -51,7 +51,7 @@
 					dbh:query(sql, params, function(row)
 						new_messages = row["new_messages"];
 					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
 			--saved voicemail count
 				if (session:ready()) then
@@ -67,7 +67,7 @@
 						dbh:query(sql, params, function(row)
 							saved_messages = row["saved_messages"];
 						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