1) Fixed wording in a few places.

2) Fixed a bug in voicemail section of pbx-asterisk init script which was causing
   the script to exit if no configuration for voicemail was found.

3 files changed, 7 insertions, 12 deletions

diff --git a/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua b/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
index b79d5250f..f68c27f77 100644
--- a/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
+++ b/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
@@ -53,13 +53,8 @@ enable:value("yes", translate("Yes"))
 enable:value("no",  translate("No"))
 enable.default = "no"
 
-timeout = s:option(Value, "global_timeout",
-                   translate("Timeout before sending callers to voicemail"))
-timeout:depends("enabled", "yes")
-timeout.default = 30
-
 emails = s:option(DynamicList, "global_email_addresses",
-                  translate("Email addresses to forward to"))
+                  translate("Email addresses to forward voicemail to"))
 emails:depends("enabled", "yes")
 
 savepath = s:option(Value, "global_save_path", translate("Directory to save voicemail into"),
@@ -93,14 +88,14 @@ s = m:section(NamedSection, "voicemail_smtp", "voicemail", translate("Outgoing m
               You can also set up a GMail, Yahoo, or other 3rd party SMTP server."))
 s.anonymous = true
 
-serv = s:option(Value, "smtp_server", translate("SMTP server hostname or IP"))
+serv = s:option(Value, "smtp_server", translate("SMTP server hostname or IP address"))
 serv.datatype = "host"
 
 port = s:option(Value, "smtp_port", translate("SMTP port number"))
 port.datatype = "port"
 port.default = "25"
 
-tls = s:option(ListValue, "smtp_tls", translate("Use TLS (secure connection)"))
+tls = s:option(ListValue, "smtp_tls", translate("Secure connection using TLS"))
 tls:value("on",  translate("Yes"))
 tls:value("off", translate("No"))
 tls.default = "on"
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
index 68bfaca85..af18c6ff0 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
@@ -206,7 +206,7 @@ for k,v in pairs(validinaccounts) do
       value = self.map:get(section, self.option)
       
       if value == nil then
-         return {translate("Rings all users enabled for incoming calls")}
+         return {translate("All users enabled for incoming calls")}
       else
          return value
       end
@@ -259,7 +259,7 @@ for k,v in pairs(validoutusers) do
       value = self.map:get(section, self.option)
       
       if value == nil then
-         return {translate("Uses all providers enabled for outgoing calls")}
+         return {translate("All providers enabled for outgoing calls")}
       else
          newvalue = {}
          -- Convert internal names to user@host values.
diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk
index fdd01d76b..6b4808b73 100755
--- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk
+++ b/applications/luci-pbx/root/etc/init.d/pbx-asterisk
@@ -601,7 +601,7 @@ pbx_configure_voicemail()
     config_get enabled global_voicemail enabled
 
     # First check if voicemail is enabled.
-    [ "$enabled" != "yes" ] && exit
+    [ "$enabled" != "yes" ] && return
 
     config_get global_timeout         global_voicemail global_timeout
     #config_get global_email_addresses global_voicemail global_email_addresses
@@ -665,7 +665,7 @@ start() {
     pbx_cook_sip_template
     pbx_cook_rtp_template
 
-    # Prepare sip.conf using settings from the "advanced" section.
+    # Prepare voicemail config.
     config_unset
     config_load ${MODULENAME}-voicemail
     pbx_configure_voicemail