Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch-contrib

mcollins/wakeup_call/Wakeup_Call_Macros.xml

+<include>
+  <!-- Wake-up call phrases -->
+  <!-- Put this file in conf/lang/en/ivr/ directory -->
+<!--
+    Requires FreeSWITCH Callie sounds version 1.0.16 or later
+-->
+  <macro name="For_one_time_wakeup_call">
+    <input pattern="(.*)">
+      <match>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-for_one_time_wakeup_call.wav"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="This_is_your_wakeup_call">
+    <input pattern="(.*)">
+      <match>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-this_is_your_wakeup_call.wav"/>
+		<action function="sleep" data="2000"/>
+		<action function="play-file" data="ivr/ivr-this_is_your_wakeup_call.wav"/>
+		<action function="sleep" data="2000"/>
+		<action function="play-file" data="ivr/ivr-wakey_wakey_sunshine.wav"/>
+		<action function="sleep" data="2000"/>
+      </match>
+    </input>
+  </macro>
+  
+  <macro name="Already_have_wakeup_call">
+    <input pattern="(.*)">
+      <match>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-requested_wakeup_call_for.wav"/>
+		<action function="sleep" data="100"/>
+		<action function="say" data="$1" method="pronounced" type="short_date_time"/>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-to_accept_press_one.wav"/>
+		<action function="sleep" data="600"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="Wakeup_call_has_been_cancelled">
+    <input pattern="(.*)">
+      <match>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-wakeup_call_cancelled.wav"/>
+		<action function="sleep" data="500"/>
+		<action function="play-file" data="voicemail/vm-goodbye.wav"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="No_wakeup_call">
+    <input pattern="(.*)">
+      <match>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-not_requested_wakeup_call.wav"/>
+		<action function="sleep" data="500"/>
+		<action function="play-file" data="voicemail/vm-goodbye.wav"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="Wakeup_call_has_been_confirmed">
+    <input pattern="(.*)">
+      <match>
+		<action function="sleep" data="1000"/>
+		<action function="play-file" data="ivr/ivr-requested_wakeup_call_for.wav"/>
+		<action function="sleep" data="500"/>
+		<action function="say" data="$1" method="pronounced" type="short_date_time"/>
+		<action function="play-file" data="voicemail/vm-goodbye.wav"/>
+      </match>
+    </input>
+  </macro>
+
+
+</include>
+

mcollins/wakeup_call/wakeup-call.lua

@@ -108,7 +108,7 @@ while (session:ready()) do
 		freeswitch.consoleLog("INFO","Calling playAndGetDigits with " .. already .. "\n")
 		digits = session:playAndGetDigits(1,1,3,9000,"#",already .. ":" .. wuc_epoch,invalid,"[0-9*#]")
 
-		if ( digits == '1' ) then
+		if ( digits ~= '1' ) then
 			api:execute("sched_del","wuc" .. caller)
 			api:execute("db","delete/wuc/" .. caller)
 			session:execute("playback", cancelled)

mod/applications/mod_translate/conf/translate.conf.xml

+<include>
+  <configuration name="translate.conf" description="Number Translation Rules">
+    <profiles>
+      <profile name="US">
+	<rule regex="^\+(\d+)$" replace="$1"/>
+	<rule regex="^(1[2-9]\d{2}[2-9]\d{6})$" replace="$1"/>
+	<rule regex="^([2-9]\d{2}[2-9]\d{6})$" replace="1$1"/>
+	<rule regex="^([2-9]\d{6})$" replace="1${areacode}$1"/>
+	<rule regex="^011(\d+)$" replace="$1"/>
+      </profile>
+      <profile name="GB">
+	<rule regex="^\+(\d+)$" replace="$1"/>
+	<rule regex="^$" replace="$1"/>
+      </profile>
+      <profile name="HK">
+	<rule regex="\+(\d+)$" replace="$1"/>
+	<rule regex="^(852\d{8})$" replace="$1"/>
+	<rule regex="^(\d{8})$" replace="852$1"/>
+      </profile>
+    </profiles>
+    <!--
+      <profile name="">
+	<rule regex="^\+(\d+)$" replace="$1"/>
+	<rule regex="^$" replace="$1"/>
+      </profile>
+    -->
+  </configuration>
+</include>

mod/applications/mod_translate/mod_translate/Makefile

+BASE=../../../..
+include $(BASE)/build/modmake.rules