From 62fb64d2faaa831247caf23bea386b1869a42bb2 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Sun, 11 Nov 2018 11:55:24 +0000
Subject: [PATCH] Fix FreeSwitch config for es_MX sounds

---
 .../rhizo_base/files/etc/freeswitch/freeswitch.xml |  4 ++--
 .../files/etc/freeswitch/lang/es/es_MX.xml         | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/rhizo_base/files/etc/freeswitch/freeswitch.xml b/modules/rhizo_base/files/etc/freeswitch/freeswitch.xml
index b067d98..6db4738 100644
--- a/modules/rhizo_base/files/etc/freeswitch/freeswitch.xml
+++ b/modules/rhizo_base/files/etc/freeswitch/freeswitch.xml
@@ -63,8 +63,8 @@
     <X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>
     <X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>
     <X-PRE-PROCESS cmd="include" data="lang/he/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/es/es_ES.xml"/>
-    <X-NO-PRE-PROCESS cmd="include" data="lang/es/es_MX.xml"/>
+    <X-NO-PRE-PROCESS cmd="include" data="lang/es/es_ES.xml"/>
+    <X-PRE-PROCESS cmd="include" data="lang/es/es_MX.xml"/>
     <X-PRE-PROCESS cmd="include" data="lang/pt/pt_BR.xml"/>
     <X-NO-PRE-PROCESS cmd="include" data="lang/pt/pt_PT.xml"/>
   </section>
diff --git a/modules/rhizo_base/files/etc/freeswitch/lang/es/es_MX.xml b/modules/rhizo_base/files/etc/freeswitch/lang/es/es_MX.xml
index 936abcf..2de282b 100644
--- a/modules/rhizo_base/files/etc/freeswitch/lang/es/es_MX.xml
+++ b/modules/rhizo_base/files/etc/freeswitch/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 -->
+  <language name="es" say-module="es" sound-prefix="$${sounds_dir}/es/mx/maria" tts-engine="cepstral" tts-voice="marta">
+    <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>