dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverted so branch is consistent for patch

Browse Source
This commit is contained in:
Matthew Vale
2015-11-02 17:32:43 +00:00
parent c47908f4e4
commit c1b5895219
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/databases/app_defaults.php
-3
View File
@@ -131,9 +131,6 @@ if ($domains_processed == 1) {
if (strlen($_SESSION['switch']['sounds']['dir']) > 0) { if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
$tmp .= correct_path(" sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n"); $tmp .= correct_path(" sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
} }
if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
$tmp .= correct_path(" phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
}
if (strlen($_SESSION['switch']['db']['dir']) > 0) { if (strlen($_SESSION['switch']['db']['dir']) > 0) {
$tmp .= correct_path(" database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n"); $tmp .= correct_path(" database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
} }
resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
+10 -1
View File
@@ -142,9 +142,18 @@
table.insert(xml, [[ </macro>]]);; table.insert(xml, [[ </macro>]]);;
end end
require "resources.functions.settings";
settings = settings(domain_uuid);
lang_path = "/usr/local/freeswitch/conf/lang/";
if (settings['switch']['phrases'] ~= nil) then
if (settings['switch']['phrases']['dir'] ~= nil) then
lang_path = settings['switch']['phrases']['dir'];
end
end
--read root xml language file, parse included xml files --read root xml language file, parse included xml files
local xml_file_paths = {} local xml_file_paths = {}
local file_handle = io.open(phrases_dir.."/"..language.."/"..language..".xml", "r"); local file_handle = io.open(lang_path.."/"..language.."/"..language..".xml", "r");
if (file_handle ~= nil) then if (file_handle ~= nil) then
for file_line in file_handle:lines() do for file_line in file_handle:lines() do
if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then