diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php index aa1b9578c3..ef35e3a4e5 100644 --- a/app/voicemail_greetings/app_languages.php +++ b/app/voicemail_greetings/app_languages.php @@ -1,66 +1,66 @@ \ No newline at end of file diff --git a/app/voicemail_greetings/v_voicemail_greetings.php b/app/voicemail_greetings/v_voicemail_greetings.php index 3f620412bc..44273b327d 100644 --- a/app/voicemail_greetings/v_voicemail_greetings.php +++ b/app/voicemail_greetings/v_voicemail_greetings.php @@ -36,7 +36,7 @@ else { } foreach($content_voicemail_greetings as $key => $value) { - $content_voicemail_greetings[$key] = $value[$_SESSION['domain']['language']['code']]; + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } require_once "includes/paging.php"; @@ -226,20 +226,20 @@ require_once "includes/paging.php"; echo "
| \n";
- echo " ".$content_voicemail_greetings['title'].": \n"; + echo " ".$text['title'].": \n"; echo " | ";
echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " | \n"; echo "
| \n";
- echo " ".$content_voicemail_greetings['description']." $user_id. \n"; + echo " ".$text['description']." $user_id. \n"; echo " | \n";
echo " |
| ".$content_voicemail_greetings['table-choose']." | \n"; - echo th_order_by('greeting_name', $content_voicemail_greetings['table-name'], $order_by, $order); - echo "".$content_voicemail_greetings['table-download']." | \n"; - echo "".$content_voicemail_greetings['table-size']." | \n"; - echo th_order_by('greeting_description', $content_voicemail_greetings['table-description'], $order_by, $order); + echo "".$text['table-choose']." | \n"; + echo th_order_by('greeting_name', $text['table-name'], $order_by, $order); + echo "".$text['table-download']." | \n"; + echo "".$text['table-size']." | \n"; + echo th_order_by('greeting_description', $text['table-description'], $order_by, $order); echo "\n";
//if (permission_exists('voicemail_greetings_add')) {
// echo " $v_link_label_add\n";
diff --git a/app/voicemail_greetings/v_voicemail_greetings_delete.php b/app/voicemail_greetings/v_voicemail_greetings_delete.php
index 76edad90b0..14a506d19f 100644
--- a/app/voicemail_greetings/v_voicemail_greetings_delete.php
+++ b/app/voicemail_greetings/v_voicemail_greetings_delete.php
@@ -36,7 +36,7 @@ else {
}
foreach($content_voicemail_greetings as $key => $value) {
- $content_voicemail_greetings[$key] = $value[$_SESSION['domain']['language']['code']];
+ $text[$key] = $value[$_SESSION['domain']['language']['code']];
}
if (count($_GET)>0) {
@@ -81,7 +81,7 @@ if (strlen($id)>0) {
require_once "includes/header.php";
echo "\n";
echo " \n";
- echo "".$content_voicemail_greetings['confirm-delete2']."\n";
+ echo "".$text['confirm-delete-2']."\n";
echo " \n";
require_once "includes/footer.php";
return;
diff --git a/app/voicemail_greetings/v_voicemail_greetings_edit.php b/app/voicemail_greetings/v_voicemail_greetings_edit.php
index 1d4f5cc53d..0881c50136 100644
--- a/app/voicemail_greetings/v_voicemail_greetings_edit.php
+++ b/app/voicemail_greetings/v_voicemail_greetings_edit.php
@@ -36,7 +36,7 @@ else {
}
foreach($content_voicemail_greetings as $key => $value) {
- $content_voicemail_greetings[$key] = $value[$_SESSION['domain']['language']['code']];
+ $text[$key] = $value[$_SESSION['domain']['language']['code']];
}
//set the action as an add or an update
@@ -68,7 +68,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//check for all required data
//if (strlen($domain_uuid) == 0) { $msg .= "Please provide: domain_uuid\n"; } - if (strlen($greeting_name) == 0) { $msg .= "".$content_voicemail_greetings['confirm-name']." \n"; } + if (strlen($greeting_name) == 0) { $msg .= "".$text['confirm-name']." \n"; } //if (strlen($greeting_description) == 0) { $msg .= "Please provide: Description \n"; } if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) { require_once "includes/header.php"; @@ -107,7 +107,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "includes/header.php"; echo "\n"; echo " \n";
- echo "".$content_voicemail_greetings['confirm-add']."\n";
+ echo "".$text['confirm-add']."\n";
echo " \n";
require_once "includes/footer.php";
return;
@@ -148,7 +148,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
require_once "includes/header.php";
echo "\n";
echo "\n";
- echo "".$content_voicemail_greetings['confirm-update']."\n";
+ echo "".$text['confirm-update']."\n";
echo " \n";
require_once "includes/footer.php";
return;
@@ -191,33 +191,33 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " |
|---|---|---|---|---|---|---|
| ".$content_voicemail_greetings['label-add']." | \n"; + echo "".$text['label-add']." | \n"; } if ($action == "update") { - echo "".$content_voicemail_greetings['label-edit']['en-us']." | \n"; + echo "".$text['label-edit']['en-us']." | \n"; } - echo "\n"; + echo " | \n"; echo " | |
| \n"; - echo " ".$content_voicemail_greetings['label-name'].":\n"; + echo " ".$text['label-name'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo "".$content_voicemail_greetings['description-name']."\n"; + echo "".$text['description-name']."\n"; echo " | \n";
echo "|||||
| \n"; - echo " ".$content_voicemail_greetings['label-description'].":\n"; + echo " ".$text['label-description'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo "".$content_voicemail_greetings['description-info']."\n"; + echo "".$text['description-info']."\n"; echo " | \n";
echo "|||||
| ".$content_voicemail_msgs['title']." | \n"; + echo "".$text['title']." | \n"; echo "\n"; echo " | |||||||||||||||||||
| \n";
- echo "".$content_voicemail_msgs['description']." \n";
+ echo "".$text['description']." \n";
if (if_group("admin") || if_group("superadmin")) {
- echo "".$content_voicemail_msgs['description2']." \n";
- echo "".$content_voicemail_msgs['description3']." \n";
+ echo "".$text['description-2']." \n";
+ echo "".$text['description-3']." \n";
echo " \n"; echo " \n"; } @@ -148,18 +150,18 @@ else { $tmp_msg_header = ''; $tmp_msg_header .= " | |||||||||||||||||||||
| Options | \n"; //$tmp_msg_header .= th_order_by('file_path', 'File Path', $order_by, $order); - $tmp_msg_header .= th_order_by('message_len', $content_voicemail_msgs['label-length'], $order_by, $order); - $tmp_msg_header .= "".$content_voicemail_msgs['label-size']." | \n"; + $tmp_msg_header .= th_order_by('message_len', $text['label-length'], $order_by, $order); + $tmp_msg_header .= "".$text['label-size']." | \n"; //$tmp_msg_header .= th_order_by('flags', 'Flags', $order_by, $order); //$tmp_msg_header .= th_order_by('read_flags', 'Read Flags', $order_by, $order); $tmp_msg_header .= "\n"; @@ -177,12 +179,12 @@ else { if (strlen($value['user']) > 0) { echo " | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| \n";
echo " \n"; - echo " ".$content_voicemail_msgs['table-mailbox'].": ".$value['user']." \n"; + echo " ".$text['table-mailbox'].": ".$value['user']." \n"; echo " \n"; echo " | \n";
echo "\n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " | \n"; echo "\n"; //echo " $v_link_label_edit\n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; echo " | \n"; echo "\n"; diff --git a/app/voicemail_msgs/v_voicemail_msgs_delete.php b/app/voicemail_msgs/v_voicemail_msgs_delete.php index 6b3c1a9d90..094a164f85 100644 --- a/app/voicemail_msgs/v_voicemail_msgs_delete.php +++ b/app/voicemail_msgs/v_voicemail_msgs_delete.php @@ -35,12 +35,14 @@ else { exit; } - foreach($content_voicemail_msgs as $key => $value) { - $content_voicemail_msgs[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } //get the http get values - if (count($_GET)>0) { + if (count($_GET) > 0) { $uuid = $_GET["uuid"]; $id = $_GET["id"]; } @@ -51,7 +53,7 @@ else { //create the event socket connection $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if (!$fp) { - $msg = "|||||||||||||||||||
| ".$content_voicemail_msgs['label-message']." | \n"; + echo "".$text['label-message']." | \n"; echo "||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| $msg | \n"; @@ -76,17 +78,17 @@ else { $response = trim(event_socket_request($fp, $cmd)); echo $xml_response; if (strcmp($response,"+OK")==0) { - $msg = "".$content_voicemail_msgs['confirm-complete'].""; + $msg = "".$text['confirm-complete'].""; } else { - $msg = "".$content_voicemail_msgs['confirm-failed'].""; + $msg = "".$text['confirm-failed'].""; } //redirect the user require_once "includes/header.php"; echo "\n"; echo "
| ".$content_voicemail_msgs['label-voicemail']." $extension | \n"; - echo "".$text['label-voicemail']." $extension | \n"; + echo "||
| \n"; - echo " ".$content_voicemail_msgs['label-password'].":\n"; + echo " ".$text['label-password'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo "".$content_voicemail_msgs['description-password']." \n"; + echo "".$text['description-password']." \n"; echo " | \n";
echo "||
| \n"; - echo " ".$content_voicemail_msgs['label-enabled'].":\n"; + echo " ".$text['label-enabled'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo " ".$content_voicemail_msgs['description-confenable']."\n"; + echo " ".$text['description-voicemail-enable']."\n"; echo " | \n";
echo "||
| \n"; - echo " ".$content_voicemail_msgs['label-mail'].":\n"; + echo " ".$text['label-mail'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo "".$content_voicemail_msgs['description-email']."\n"; + echo "".$text['description-email']."\n"; echo " | \n";
echo "||
| \n"; - echo " ".$content_voicemail_msgs['label-attach'].":\n"; + echo " ".$text['label-attach'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo "".$content_voicemail_msgs['description-email-attachment']."\n"; + echo "".$text['description-email-attachment']."\n"; echo " | \n";
echo "||
| \n"; - echo " ".$content_voicemail_msgs['label-vm'].":\n"; + echo " ".$text['label-vm'].":\n"; echo " | \n"; echo "\n";
echo " \n";
echo " \n"; - echo "".$content_voicemail_msgs['description-keep-local']." \n"; + echo "".$text['description-keep-local']." \n"; echo " | \n";
echo "
| ".$content_voicemail_msgs['label-message']." | \n"; + echo "".$text['label-message']." | \n"; echo "|||
|---|---|---|---|---|
| $msg | \n"; diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 1c29533534..66110cec9f 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -1,153 +1,153 @@ \ No newline at end of file diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index d5524a9e5e..8aba857832 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -35,9 +35,9 @@ else { exit; } - //prepare the languages - foreach($content_cdr as $key => $value) { - $content_cdr[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } //import xml_cdr files @@ -71,12 +71,12 @@ else { echo "
| ".$content_cdr['title']." | \n"; + echo "".$text['title']." | \n"; echo "\n";
echo "
|