Fix the app_languages labels as the only the type should have the dash after it. Fix the spacing so the layout looks better.

This commit is contained in:
Mark Crane
2014-11-08 21:44:57 +00:00
parent 66fc5354dd
commit ef6f6ed9f4
4 changed files with 58 additions and 71 deletions
+27 -38
View File
@@ -1,7 +1,6 @@
<?php <?php
// Contacts // Contacts
$text['title-contacts']['en-us'] = "Contacts"; $text['title-contacts']['en-us'] = "Contacts";
$text['title-contacts']['es-cl'] = "Contactos"; $text['title-contacts']['es-cl'] = "Contactos";
$text['title-contacts']['pt-pt'] = "Contactos"; $text['title-contacts']['pt-pt'] = "Contactos";
@@ -193,74 +192,65 @@
$text['description-contact_note']['pt-pt'] = "Introduza uma nota."; $text['description-contact_note']['pt-pt'] = "Introduza uma nota.";
$text['description-contact_note']['fr-fr'] = ""; $text['description-contact_note']['fr-fr'] = "";
$text['label-contact_properties']['en-us'] = "Properties"; $text['label-contact_settings']['en-us'] = "Settings";
$text['label-contact_properties']['es-cl'] = "Propiedades"; $text['label-contact_settings']['es-cl'] = "Ajustes";
$text['label-contact_properties']['pt-pt'] = "Propiedades"; $text['label-contact_settings']['pt-pt'] = "Configurações";
$text['label-contact_properties']['fr-fr'] = "Propietés"; $text['label-contact_settings']['fr-fr'] = "Paramètres";
$text['label-contact_value']['en-us'] = "Value"; $text['label-contact_value']['en-us'] = "Value";
$text['label-contact_value']['es-cl'] = "Valor"; $text['label-contact_value']['es-cl'] = "Valor";
$text['label-contact_value']['pt-pt'] = "Valor"; $text['label-contact_value']['pt-pt'] = "Valor";
$text['label-contact_value']['fr-fr'] = "Valeur"; $text['label-contact_value']['fr-fr'] = "Valeur";
$text['description-contact_value']['en-us'] = "Enter the value of this setting."; $text['description-contact_value']['en-us'] = "Enter the value of this setting.";
$text['description-contact_value']['es-cl'] = "Ingrese el valor para esta configuración."; $text['description-contact_value']['es-cl'] = "Ingrese el valor para esta configuración.";
$text['description-contact_value']['pt-pt'] = "Introduza o valor desta definição."; $text['description-contact_value']['pt-pt'] = "Introduza o valor desta definição.";
$text['description-contact_value']['fr-fr'] = ""; $text['description-contact_value']['fr-fr'] = "";
$text['label-true']['en-us'] = "True"; $text['label-true']['en-us'] = "True";
$text['label-true']['es-cl'] = "Verdadero"; $text['label-true']['es-cl'] = "Verdadero";
$text['label-true']['pt-pt'] = "Sim"; $text['label-true']['pt-pt'] = "Sim";
$text['label-true']['fr-fr'] = "Oui"; $text['label-true']['fr-fr'] = "Oui";
$text['label-false']['en-us'] = "False"; $text['label-false']['en-us'] = "False";
$text['label-false']['es-cl'] = "Falso"; $text['label-false']['es-cl'] = "Falso";
$text['label-false']['pt-pt'] = "Não"; $text['label-false']['pt-pt'] = "Não";
$text['label-false']['fr-fr'] = "Non"; $text['label-false']['fr-fr'] = "Non";
$text['label-order']['en-us'] = "Order"; $text['label-order']['en-us'] = "Order";
$text['label-order']['es-cl'] = "Orden"; $text['label-order']['es-cl'] = "Orden";
$text['label-order']['pt-pt'] = "Ordem"; $text['label-order']['pt-pt'] = "Ordem";
$text['label-order']['fr-fr'] = "Ordre"; $text['label-order']['fr-fr'] = "Ordre";
$text['description-order']['en-us'] = "Set the order (index) for this array element."; $text['description-order']['en-us'] = "Set the order (index) for this array element.";
$text['description-order']['es-cl'] = "Establecer el orden (<ED>ndice) para este elemento de la matriz."; $text['description-order']['es-cl'] = "Establecer el orden (<ED>ndice) para este elemento de la matriz.";
$text['description-order']['pt-pt'] = "Defina a ordem (<ED>ndice) para este elemento da matriz."; $text['description-order']['pt-pt'] = "Defina a ordem (<ED>ndice) para este elemento da matriz.";
$text['description-order']['fr-fr'] = "D<E9>finir l'ordre (index) pour cet <E9>l<E9>ment de tableau."; $text['description-order']['fr-fr'] = "D<E9>finir l'ordre (index) pour cet <E9>l<E9>ment de tableau.";
$text['header-contact_setting_edit']['en-us'] = "Contact Setting";
$text['header-contact_setting_edit']['es-cl'] = "Configuraciones de contacto";
$text['header-contact_setting_edit']['pt-pt'] = "Definições do Contacto";
$text['header-contact_setting_edit']['fr-fr'] = "Paramètres du Contact";
$text['header-contact_setting-edit']['en-us'] = "Contact Setting"; $text['header-contact_setting_add']['en-us'] = "Contact Setting Add";
$text['header-contact_setting-edit']['es-cl'] = "Configuraciones de contacto"; $text['header-contact_setting_add']['es-cl'] = "Agregar Configuración de Contacto";
$text['header-contact_setting-edit']['pt-pt'] = "Definições do Contacto"; $text['header-contact_setting_add']['pt-pt'] = "Adicionar Definição ao Contacto";
$text['header-contact_setting-edit']['fr-fr'] = "Paramètres du Contact"; $text['header-contact_setting_add']['fr-fr'] = "Ajouter un paramètre au Contact";
$text['title-contact_setting_edit']['en-us'] = "Contact Setting";
$text['title-contact_setting_edit']['es-cl'] = "Configuraciones de contacto";
$text['title-contact_setting_edit']['pt-pt'] = "Definições do Contacto";
$text['title-contact_setting_edit']['fr-fr'] = "Paramètres du Contact";
$text['header-contact_setting-add']['en-us'] = "Contact Setting Add"; $text['title-contact_setting_add']['en-us'] = "Contact Setting Add";
$text['header-contact_setting-add']['es-cl'] = "Agregar Configuración de Contacto"; $text['title-contact_setting_add']['es-cl'] = "Agregar Configuración de Contacto";
$text['header-contact_setting-add']['pt-pt'] = "Adicionar Definição ao Contacto"; $text['title-contact_setting_add']['pt-pt'] = "Adicionar Definição ao Contacto";
$text['header-contact_setting-add']['fr-fr'] = "Ajouter un paramètre au Contact"; $text['title-contact_setting_add']['fr-fr'] = "Ajouter un paramètre au Contact";
$text['title-contact_setting-edit']['en-us'] = "Contact Setting";
$text['title-contact_setting-edit']['es-cl'] = "Configuraciones de contacto";
$text['title-contact_setting-edit']['pt-pt'] = "Definições do Contacto";
$text['title-contact_setting-edit']['fr-fr'] = "Paramètres du Contact";
$text['description-contact_setting_edit']['en-us'] = "Edit a setting for this contact.";
$text['title-contact_setting-add']['en-us'] = "Contact Setting Add"; $text['description-contact_setting_edit']['es-cl'] = "Edita una configuración para este contacto.";
$text['title-contact_setting-add']['es-cl'] = "Agregar Configuración de Contacto"; $text['description-contact_setting_edit']['pt-pt'] = "Editar uma definição deste contacto.";
$text['title-contact_setting-add']['pt-pt'] = "Adicionar Definição ao Contacto"; $text['description-contact_setting_edit']['fr-fr'] = "Editer un paramètre du contact.";
$text['title-contact_setting-add']['fr-fr'] = "Ajouter un paramètre au Contact";
$text['description-contact_setting-edit']['en-us'] = "Edit a setting for this contact.";
$text['description-contact_setting-edit']['es-cl'] = "Edita una configuración para este contacto.";
$text['description-contact_setting-edit']['pt-pt'] = "Editar uma definição deste contacto.";
$text['description-contact_setting-edit']['fr-fr'] = "Editer un paramètre du contact.";
$text['label-shared']['en-us'] = "Shared"; $text['label-shared']['en-us'] = "Shared";
$text['label-shared']['es-cl'] = "Compartido"; $text['label-shared']['es-cl'] = "Compartido";
@@ -648,7 +638,6 @@
$text['label-import_file_upload']['pt-pt'] = "Ficheiro para submeter"; $text['label-import_file_upload']['pt-pt'] = "Ficheiro para submeter";
$text['label-import_file_upload']['fr-fr'] = "Fichier à télécharger"; $text['label-import_file_upload']['fr-fr'] = "Fichier à télécharger";
$text['button-upload']['en-us'] = "Upload"; $text['button-upload']['en-us'] = "Upload";
$text['button-upload']['es-cl'] = "Subir"; $text['button-upload']['es-cl'] = "Subir";
$text['button-upload']['pt-pt'] = "Submeter"; $text['button-upload']['pt-pt'] = "Submeter";
@@ -710,4 +699,4 @@
$text['message-required']['pt-pt'] = "Por favor indique: "; $text['message-required']['pt-pt'] = "Por favor indique: ";
$text['message-required']['fr-fr'] = "Merci d'indiquer: "; $text['message-required']['fr-fr'] = "Merci d'indiquer: ";
?> ?>
+16 -15
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012 Portions created by the Initial Developer are Copyright (C) 2008-2014
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@@ -34,24 +34,25 @@ require_once "resources/check_auth.php";
$text[$key] = $value[$_SESSION['domain']['language']['code']]; $text[$key] = $value[$_SESSION['domain']['language']['code']];
} }
if (count($_GET)>0) { //set the variables
$id = check_str($_GET["id"]); if (count($_GET) > 0) {
$contact_uuid = check_str($_GET["contact_uuid"]); $id = check_str($_GET["id"]);
} $contact_uuid = check_str($_GET["contact_uuid"]);
}
if (strlen($id)>0) { //delete domain_setting
//delete domain_setting if (strlen($id) > 0) {
$sql = "delete from v_contact_settings "; $sql = "delete from v_contact_settings ";
$sql .= "where contact_uuid = '$contact_uuid' "; $sql .= "where contact_uuid = '$contact_uuid' ";
$sql .= "and contact_setting_uuid = '$id' "; $sql .= "and contact_setting_uuid = '$id' ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
unset($sql); unset($sql);
} }
//redirect the user //redirect the user
$_SESSION["message"] = $text['message-delete']; $_SESSION["message"] = $text['message-delete'];
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
?> ?>
+3 -3
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012 Portions created by the Initial Developer are Copyright (C) 2008-2014
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@@ -200,7 +200,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo $text['header-contact_setting-edit']; echo $text['header-contact_setting-edit'];
} }
if ($action == "add") { if ($action == "add") {
echo $text['header-contact_setting-add']; echo $text['header-contact_setting_add'];
} }
echo "</b></td>\n"; echo "</b></td>\n";
echo "<td width='70%' align='right'>"; echo "<td width='70%' align='right'>";
@@ -214,7 +214,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo $text['description-contact_setting-edit']; echo $text['description-contact_setting-edit'];
} }
if ($action == "add") { if ($action == "add") {
echo $text['header-contact_setting-add']; echo $text['header-contact_setting_add'];
} }
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "</td>\n"; echo "</td>\n";
+12 -15
View File
@@ -27,7 +27,6 @@
require_once "root.php"; require_once "root.php";
require_once "resources/require.php"; require_once "resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
//require_once "resources/header.php"; //require_once "resources/header.php";
require_once "resources/paging.php"; require_once "resources/paging.php";
@@ -35,7 +34,6 @@ require_once "resources/paging.php";
$order_by = $_GET["order_by"]; $order_by = $_GET["order_by"];
$order = $_GET["order"]; $order = $_GET["order"];
//prepare to page the results //prepare to page the results
$sql = "select count(*) as num_rows from v_contact_settings "; $sql = "select count(*) as num_rows from v_contact_settings ";
$sql .= "where contact_uuid = '$contact_uuid' "; $sql .= "where contact_uuid = '$contact_uuid' ";
@@ -82,15 +80,15 @@ require_once "resources/paging.php";
$row_style["1"] = "row_style1"; $row_style["1"] = "row_style1";
//show the content //show the content
if ($num_rows == 0) {
echo "<table width='100%' border='0'>\n"; echo "<table width='100%' border='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td width='50%' align='left' nowrap='nowrap'><b>".$text['label-contact_properties']."</b></td>\n"; echo "<td width='50%' align='left' nowrap='nowrap'><b>".$text['label-contact_settings']."</b></td>\n";
echo "<td width='50%' align='right'>&nbsp;</td>\n"; echo "<td width='50%' align='right'>&nbsp;</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "</table>\n"; echo "</table>\n";
}
echo "<br /><br />";
echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
if ($result_count > 0) { if ($result_count > 0) {
@@ -107,9 +105,9 @@ require_once "resources/paging.php";
echo " </td>\n"; echo " </td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<th>".$text['label-subcategory']."</th>"; echo "<th>".$text['label-subcategory']."sub</th>";
echo "<th>".$text['label-type']."</th>"; echo "<th>".$text['label-type']."type</th>";
echo "<th>".$text['label-value']."</th>"; echo "<th>".$text['label-value']."value</th>";
echo "<th style='text-align: center;'>".$text['label-enabled']."</th>"; echo "<th style='text-align: center;'>".$text['label-enabled']."</th>";
echo "<th>".$text['label-description']."</th>"; echo "<th>".$text['label-description']."</th>";
echo "<td class='list_control_icons'>"; echo "<td class='list_control_icons'>";
@@ -166,7 +164,6 @@ require_once "resources/paging.php";
echo "</tr>\n"; echo "</tr>\n";
echo "</table>"; echo "</table>";
//include the footer //include the footer
//require_once "resources/footer.php"; //require_once "resources/footer.php";
?> ?>