From 44dce0b110d4d41511158d5e9f1d349ccd9dab19 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 23 Feb 2014 08:34:06 +0000 Subject: [PATCH] Response message updates, language fixes. --- app/settings/app_languages.php | 25 ++++++++++++++++---- app/settings/setting_edit.php | 42 ++++++++++++++-------------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/app/settings/app_languages.php b/app/settings/app_languages.php index e791b434dc..fb8cc3a3d6 100644 --- a/app/settings/app_languages.php +++ b/app/settings/app_languages.php @@ -26,10 +26,15 @@ Philippe Rioual */ - $text['title-settings']['en-us'] = "Setting Update"; - $text['title-settings']['es-cl'] = "Actualizar Configuración"; - $text['title-settings']['pt-pt'] = "Actualiza a Configuração"; - $text['title-settings']['fr-fr'] = "Mise à jour de la configuration"; + $text['title-settings-add']['en-us'] = "Setting Add"; + $text['title-settings-add']['es-cl'] = "Añadir Configuración"; + $text['title-settings-add']['pt-pt'] = "Adicionar Configuração"; + $text['title-settings-add']['fr-fr'] = "Ajouter Cadre"; + + $text['title-settings-update']['en-us'] = "Setting Update"; + $text['title-settings-update']['es-cl'] = "Actualizar Configuración"; + $text['title-settings-update']['pt-pt'] = "Actualiza a Configuração"; + $text['title-settings-update']['fr-fr'] = "Mise à jour de la configuration"; $text['label-event-socket-ip']['en-us'] = "Event Socket IP Address:"; $text['label-event-socket-ip']['es-cl'] = "Dirección IP del Socket de Eventos:"; @@ -122,11 +127,23 @@ $text['description-shout-volume']['fr-fr'] = "Choisir l'amplification du volume pour Mod Shout."; $text['button-back']['en-us'] = "Back"; + $text['button-back']['es-cl'] = "Volver"; $text['button-back']['pt-pt'] = "Voltar"; $text['button-back']['fr-fr'] = "Retour"; $text['button-save']['en-us'] = "Save"; + $text['button-back']['es-cl'] = "Guardar"; $text['button-save']['pt-pt'] = "Guardar"; $text['button-save']['fr-fr'] = "Sauvegarder"; + $text['message-add']['en-us'] = "Add Completed"; + $text['message-add']['es-cl'] = "Agregar Completado"; + $text['message-add']['pt-pt'] = "Adição Efectuada"; + $text['message-add']['fr-fr'] = "Ajouté"; + + $text['message-update']['en-us'] = "Update Completed"; + $text['message-update']['es-cl'] = "Actualización Completada"; + $text['message-update']['pt-pt'] = "Actualização Efectuada"; + $text['message-update']['fr-fr'] = "Mis à Jour"; + ?> diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php index 9655d1ef7a..1abf5dcf4f 100644 --- a/app/settings/setting_edit.php +++ b/app/settings/setting_edit.php @@ -34,14 +34,14 @@ else { echo "access denied"; exit; } - + //add multi-lingual support require_once "app_languages.php"; foreach($text as $key => $value) { $text[$key] = $value[$_SESSION['domain']['language']['code']]; } -//get the number of rows in v_extensions +//get the number of rows in v_extensions $sql = " select count(*) as num_rows from v_settings "; $prep_statement = $db->prepare(check_sql($sql)); $num_rows = 0; @@ -123,7 +123,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/footer.php"; return; } - + //add or update the database if ($_POST["persistformvar"] != "true") { if ($action == "add" && permission_exists('setting_edit')) { @@ -155,14 +155,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //synchronize settings - save_setting_xml(); + save_setting_xml(); - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "Add Complete\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-add']; + header("Location: setting_edit.php"); return; } //if ($action == "add") @@ -181,14 +177,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //synchronize settings - save_setting_xml(); + save_setting_xml(); - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "Update Complete\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-update']; + header("Location: setting_edit.php"); return; } //if ($action == "update") } //if ($_POST["persistformvar"] != "true") @@ -234,12 +226,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; if ($action == "add") { - echo "Setting Add\n"; + echo "".$text['title-settings-add']."\n"; } if ($action == "update") { - echo "".$text['title-settings']."\n"; + echo "".$text['title-settings-update']."\n"; } - echo "\n"; + //echo "\n"; echo "\n"; echo "\n"; @@ -338,19 +330,19 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo " \n"; echo " \n"; - if ($smtp_auth == "true") { + if ($smtp_auth == "true") { echo " \n"; } else { echo " \n"; } - if ($smtp_auth == "false") { + if ($smtp_auth == "false") { echo " \n"; } else {