From 458266a963b910ae8305b9aa08de44ec03b5314b Mon Sep 17 00:00:00 2001
From: Italo Rossi <italorossib@gmail.com>
Date: Thu, 29 Jun 2017 15:12:39 -0300
Subject: [PATCH] FS-10444 [vanilla config/languages] Adding phrases and macros
 tag to languages es, pt and sv

---
 conf/vanilla/lang/es/es_ES.xml | 12 ++++++++----
 conf/vanilla/lang/es/es_MX.xml | 12 ++++++++----
 conf/vanilla/lang/pt/pt_BR.xml | 12 ++++++++----
 conf/vanilla/lang/pt/pt_PT.xml | 12 ++++++++----
 conf/vanilla/lang/sv/sv.xml    | 10 +++++++---
 5 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/conf/vanilla/lang/es/es_ES.xml b/conf/vanilla/lang/es/es_ES.xml
index f8de6858ea..3467bed1b0 100644
--- a/conf/vanilla/lang/es/es_ES.xml
+++ b/conf/vanilla/lang/es/es_ES.xml
@@ -1,8 +1,12 @@
 <include>
   <language name="es" sound-path="$${sounds_dir}/es/ES/cristina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-ES.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_ES_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-ES.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-ES.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-es-ES.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_es_ES_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-es-ES.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-es-ES.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>
diff --git a/conf/vanilla/lang/es/es_MX.xml b/conf/vanilla/lang/es/es_MX.xml
index 936abcf16f..e44f819443 100644
--- a/conf/vanilla/lang/es/es_MX.xml
+++ b/conf/vanilla/lang/es/es_MX.xml
@@ -1,8 +1,12 @@
 <include>
   <language name="es" sound-path="$${sounds_dir}/es/mx/maria" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-MX.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_MX_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-MX.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-MX.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-es-MX.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_es_MX_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-es-MX.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-es-MX.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>
diff --git a/conf/vanilla/lang/pt/pt_BR.xml b/conf/vanilla/lang/pt/pt_BR.xml
index 690ee6974c..f85c5b6d5f 100644
--- a/conf/vanilla/lang/pt/pt_BR.xml
+++ b/conf/vanilla/lang/pt/pt_BR.xml
@@ -1,8 +1,12 @@
 <include>
   <language name="pt" sound-path="$${sounds_dir}/pt/BR/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-BR.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_BR_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-BR.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-BR.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-pt-BR.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_pt_BR_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-BR.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-BR.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>
diff --git a/conf/vanilla/lang/pt/pt_PT.xml b/conf/vanilla/lang/pt/pt_PT.xml
index c30b3612f1..2ac59e9168 100644
--- a/conf/vanilla/lang/pt/pt_PT.xml
+++ b/conf/vanilla/lang/pt/pt_PT.xml
@@ -1,8 +1,12 @@
 <include>
   <language name="pt" sound-path="$${sounds_dir}/pt/PT/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-PT.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_PT_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-PT.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-PT.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-pt-PT.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_pt_PT_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-PT.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-PT.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>
diff --git a/conf/vanilla/lang/sv/sv.xml b/conf/vanilla/lang/sv/sv.xml
index f77e0221f6..8482b8f475 100644
--- a/conf/vanilla/lang/sv/sv.xml
+++ b/conf/vanilla/lang/sv/sv.xml
@@ -1,7 +1,11 @@
 <include>
   <language name="sv" sound-path="$${sounds_dir}/sv/se/jakob" tts-engine="" tts-voice="">
-    <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-    <!--voicemail is purely implemented with files based one that is the default. -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
+        <!--voicemail is purely implemented with files based one that is the default. -->
+      </macros>
+    </phrases>
   </language>
 </include>