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

Remove change $content_user to $text to be more consistent with the other app_languages.php files.

Browse Source
This commit is contained in:
Mark Crane
2013-01-05 09:59:27 +00:00
parent 1a0cb04bd3
commit 9ba7e2f6e2
2 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/user_settings/app_languages.php
+42 -42
View File
@@ -1,67 +1,67 @@
<?php <?php
$content_users['title']['en-us'] = 'Account Settings'; $text['title']['en-us'] = 'Account Settings';
$content_users['title']['pt-pt'] = 'Configurações de Conta'; $text['title']['pt-pt'] = 'Configurações de Conta';
$content_users['description']['en-us'] = 'Edit account information.'; $text['description']['en-us'] = 'Edit account information.';
$content_users['description']['pt-pt'] = 'Editar informações de conta.'; $text['description']['pt-pt'] = 'Editar informações de conta.';
$content_users['button-back']['en-us'] = 'Back'; $text['button-back']['en-us'] = 'Back';
$content_users['button-back']['pt-pt'] = 'Voltar'; $text['button-back']['pt-pt'] = 'Voltar';
$content_users['button-save']['en-us'] = 'Save'; $text['button-save']['en-us'] = 'Save';
$content_users['button-save']['pt-pt'] = 'Guardar'; $text['button-save']['pt-pt'] = 'Guardar';
$content_users['table-title']['en-us'] = 'User Info'; $text['table-title']['en-us'] = 'User Info';
$content_users['table-title']['pt-pt'] = 'Informações de Utilizador'; $text['table-title']['pt-pt'] = 'Informações de Utilizador';
$content_users['label-username']['en-us'] = 'Username'; $text['label-username']['en-us'] = 'Username';
$content_users['label-username']['pt-pt'] = 'Nome de Utilizador'; $text['label-username']['pt-pt'] = 'Nome de Utilizador';
$content_users['label-password']['en-us'] = 'Password'; $text['label-password']['en-us'] = 'Password';
$content_users['label-password']['pt-pt'] = 'Palavra passe'; $text['label-password']['pt-pt'] = 'Palavra passe';
$content_users['label-confirm-password']['en-us'] = 'Confirm Password'; $text['label-confirm-password']['en-us'] = 'Confirm Password';
$content_users['label-confirm-password']['pt-pt'] = 'Confirme Palavra Chave'; $text['label-confirm-password']['pt-pt'] = 'Confirme Palavra Chave';
$content_users['label-extension']['en-us'] = 'Extension'; $text['label-extension']['en-us'] = 'Extension';
$content_users['label-extension']['pt-pt'] = 'Extensão'; $text['label-extension']['pt-pt'] = 'Extensão';
$content_users['table2-title']['en-us'] = 'Additional Info'; $text['table2-title']['en-us'] = 'Additional Info';
$content_users['table2-title']['pt-pt'] = 'Informações Adicionais'; $text['table2-title']['pt-pt'] = 'Informações Adicionais';
$content_users['label-status']['en-us'] = 'Status'; $text['label-status']['en-us'] = 'Status';
$content_users['label-status']['pt-pt'] = 'Estado'; $text['label-status']['pt-pt'] = 'Estado';
$content_users['description-status']['en-us'] = 'Select a the user status.'; $text['description-status']['en-us'] = 'Select a the user status.';
$content_users['description-status']['pt-pt'] = 'Selecione um estado para o utilizador.'; $text['description-status']['pt-pt'] = 'Selecione um estado para o utilizador.';
$content_users['check-available-status']['en-us'] = 'Available'; $text['check-available-status']['en-us'] = 'Available';
$content_users['check-available-status']['pt-pt'] = 'Disponível'; $text['check-available-status']['pt-pt'] = 'Disponível';
$content_users['check-available-ondemand-status']['en-us'] = 'Available (On Demand)'; $text['check-available-ondemand-status']['en-us'] = 'Available (On Demand)';
$content_users['check-available-ondemand-status']['pt-pt'] = 'Disponível (A pedido)'; $text['check-available-ondemand-status']['pt-pt'] = 'Disponível (A pedido)';
$content_users['check-loggedout-status']['en-us'] = 'Logged Out'; $text['check-loggedout-status']['en-us'] = 'Logged Out';
$content_users['check-loggedout-status']['pt-pt'] = 'Desligado'; $text['check-loggedout-status']['pt-pt'] = 'Desligado';
$content_users['check-onbreak-status']['en-us'] = 'On Break'; $text['check-onbreak-status']['en-us'] = 'On Break';
$content_users['check-onbreak-status']['pt-pt'] = 'Em Pausa'; $text['check-onbreak-status']['pt-pt'] = 'Em Pausa';
$content_users['check-do-not-disturb-status']['en-us'] = 'Do Not Disturb'; $text['check-do-not-disturb-status']['en-us'] = 'Do Not Disturb';
$content_users['check-do-not-disturb-status']['pt-pt'] = 'Não Perturbar'; $text['check-do-not-disturb-status']['pt-pt'] = 'Não Perturbar';
$content_users['label-time']['en-us'] = 'Time Zone'; $text['label-time']['en-us'] = 'Time Zone';
$content_users['label-time']['pt-pt'] = 'Fuso Horário'; $text['label-time']['pt-pt'] = 'Fuso Horário';
$content_users['description-timezone']['en-us'] = 'Select the default time zone.'; $text['description-timezone']['en-us'] = 'Select the default time zone.';
$content_users['description-timezone']['pt-pt'] = 'Selecione o fuso horário padrão.'; $text['description-timezone']['pt-pt'] = 'Selecione o fuso horário padrão.';
$content_users['confirm-password']['en-us'] = 'Passwords did not match.'; $text['confirm-password']['en-us'] = 'Passwords did not match.';
$content_users['confirm-password']['pt-pt'] = 'As palavras chave não coincidem.'; $text['confirm-password']['pt-pt'] = 'As palavras chave não coincidem.';
$content_users['confirm-update']['en-us'] = 'Update Complete'; $text['confirm-update']['en-us'] = 'Update Complete';
$content_users['confirm-update']['pt-pt'] = 'Actualização Completa'; $text['confirm-update']['pt-pt'] = 'Actualização Completa';
$text['title-user-settings']['en-us'] = 'User Information'; $text['title-user-settings']['en-us'] = 'User Information';
$text['title-user-settings']['pt-pt'] = 'Informação do Utilizador'; $text['title-user-settings']['pt-pt'] = 'Informação do Utilizador';
core/user_settings/user_edit.php
+30 -29
View File
@@ -36,9 +36,10 @@ else {
return; return;
} }
//add multi-lingual support
foreach($content_users as $key => $value) { require_once "app_languages.php";
$content_users[$key] = $value[$_SESSION['domain']['language']['code']]; foreach($text as $key => $value) {
$text[$key] = $value[$_SESSION['domain']['language']['code']];
} }
//set the username from v_users //set the username from v_users
@@ -87,7 +88,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
$msg = ''; $msg = '';
//if (strlen($password) == 0) { $msg .= "Password cannot be blank.<br>\n"; } //if (strlen($password) == 0) { $msg .= "Password cannot be blank.<br>\n"; }
if ($password != $confirm_password) { $msg .= "".$content_users['confirm-password']."<br>\n"; } if ($password != $confirm_password) { $msg .= "".$text['confirm-password']."<br>\n"; }
//if (strlen($user_time_zone) == 0) { $msg .= "Please provide an time zone.<br>\n"; } //if (strlen($user_time_zone) == 0) { $msg .= "Please provide an time zone.<br>\n"; }
if (strlen($msg) > 0) { if (strlen($msg) > 0) {
@@ -200,7 +201,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
//redirect the browser //redirect the browser
require_once "includes/header.php"; require_once "includes/header.php";
echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/user_settings/user_edit.php\">\n"; echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/user_settings/user_edit.php\">\n";
echo "<div align='center'>".$content_users['confirm-update']."</div>"; echo "<div align='center'>".$text['confirm-update']."</div>";
require_once "includes/footer.php"; require_once "includes/footer.php";
return; return;
} }
@@ -235,15 +236,15 @@ else {
echo "<td>\n"; echo "<td>\n";
echo "<table $table_width cellpadding='3' cellspacing='0' border='0'>"; echo "<table $table_width cellpadding='3' cellspacing='0' border='0'>";
echo "<td align='left' width='90%' nowrap><b>".$content_users['title']."</b></td>\n"; echo "<td align='left' width='90%' nowrap><b>".$text['title']."</b></td>\n";
echo "<td nowrap='nowrap'>\n"; echo "<td nowrap='nowrap'>\n";
echo " <input type='submit' name='submit' class='btn' value='".$content_users['button-save']."'>"; echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
echo " <input type='button' class='btn' onclick=\"window.location='".$_SESSION['login']['destination']['url']."'\" value='".$content_users['button-back']."'>"; echo " <input type='button' class='btn' onclick=\"window.location='".$_SESSION['login']['destination']['url']."'\" value='".$text['button-back']."'>";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td align='left' colspan='2'>\n"; echo "<td align='left' colspan='2'>\n";
echo " ".$content_users['description']." \n"; echo " ".$text['description']." \n";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "</table>\n"; echo "</table>\n";
@@ -252,20 +253,20 @@ else {
echo "<table $table_width cellpadding='6' cellspacing='0' border='0'>"; echo "<table $table_width cellpadding='6' cellspacing='0' border='0'>";
echo "<tr>\n"; echo "<tr>\n";
echo " <th class='th' colspan='2' align='left'>".$content_users['table-title']."</th>\n"; echo " <th class='th' colspan='2' align='left'>".$text['table-title']."</th>\n";
echo "</tr>\n"; echo "</tr>\n";
echo " <tr>"; echo " <tr>";
echo " <td width='30%' class='vncellreq'>".$content_users['label-username'].":</td>"; echo " <td width='30%' class='vncellreq'>".$text['label-username'].":</td>";
echo " <td width='70%' class='vtable'>$username</td>"; echo " <td width='70%' class='vtable'>$username</td>";
echo " </tr>"; echo " </tr>";
echo " <tr>"; echo " <tr>";
echo " <td class='vncell'>".$content_users['label-password'].":</td>"; echo " <td class='vncell'>".$text['label-password'].":</td>";
echo " <td class='vtable'><input type='password' autocomplete='off' class='formfld' name='password' value=\"\"></td>"; echo " <td class='vtable'><input type='password' autocomplete='off' class='formfld' name='password' value=\"\"></td>";
echo " </tr>"; echo " </tr>";
echo " <tr>"; echo " <tr>";
echo " <td class='vncell'>".$content_users['label-confirm-password'].":</td>"; echo " <td class='vncell'>".$text['label-confirm-password'].":</td>";
echo " <td class='vtable'><input type='password' autocomplete='off' class='formfld' name='confirm_password' value=\"\"></td>"; echo " <td class='vtable'><input type='password' autocomplete='off' class='formfld' name='confirm_password' value=\"\"></td>";
echo " </tr>"; echo " </tr>";
@@ -277,7 +278,7 @@ else {
echo "<table $table_width cellpadding='6' cellspacing='0'>"; echo "<table $table_width cellpadding='6' cellspacing='0'>";
echo " <tr>\n"; echo " <tr>\n";
echo " <th class='th' colspan='2' align='left'>".$content_users['table2-title']."</th>\n"; echo " <th class='th' colspan='2' align='left'>".$text['table2-title']."</th>\n";
echo " </tr>\n"; echo " </tr>\n";
if ($_SESSION['user_status_display'] == "false") { if ($_SESSION['user_status_display'] == "false") {
@@ -286,44 +287,44 @@ else {
else { else {
echo " <tr>\n"; echo " <tr>\n";
echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n"; echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n";
echo " ".$content_users['label-status'].":\n"; echo " ".$text['label-status'].":\n";
echo " </td>\n"; echo " </td>\n";
echo " <td class=\"vtable\">\n"; echo " <td class=\"vtable\">\n";
echo " <select id='user_status' name='user_status' class='formfld' style=''>\n"; echo " <select id='user_status' name='user_status' class='formfld' style=''>\n";
echo " <option value=''></option>\n"; echo " <option value=''></option>\n";
if ($user_status == "Available") { if ($user_status == "Available") {
echo " <option value='Available' selected='selected'>".$content_users['check-available-status']."</option>\n"; echo " <option value='Available' selected='selected'>".$text['check-available-status']."</option>\n";
} }
else { else {
echo " <option value='Available'>".$content_users['check-available-status']."</option>\n"; echo " <option value='Available'>".$text['check-available-status']."</option>\n";
} }
if ($user_status == "Available (On Demand)") { if ($user_status == "Available (On Demand)") {
echo " <option value='Available (On Demand)' selected='selected'>".$content_users['check-available-ondemand-status']."</option>\n"; echo " <option value='Available (On Demand)' selected='selected'>".$text['check-available-ondemand-status']."</option>\n";
} }
else { else {
echo " <option value='Available (On Demand)'>".$content_users['check-available-ondemand-status']."</option>\n"; echo " <option value='Available (On Demand)'>".$text['check-available-ondemand-status']."</option>\n";
} }
if ($user_status == "Logged Out") { if ($user_status == "Logged Out") {
echo " <option value='Logged Out' selected='selected'>".$content_users['check-loggedout-status']."</option>\n"; echo " <option value='Logged Out' selected='selected'>".$text['check-loggedout-status']."</option>\n";
} }
else { else {
echo " <option value='Logged Out'>".$content_users['check-loggedout-status']."</option>\n"; echo " <option value='Logged Out'>".$text['check-loggedout-status']."</option>\n";
} }
if ($user_status == "On Break") { if ($user_status == "On Break") {
echo " <option value='On Break' selected='selected'>".$content_users['check-onbreak-status']."</option>\n"; echo " <option value='On Break' selected='selected'>".$text['check-onbreak-status']."</option>\n";
} }
else { else {
echo " <option value='On Break'>".$content_users['check-onbreak-status']."</option>\n"; echo " <option value='On Break'>".$text['check-onbreak-status']."</option>\n";
} }
if ($user_status == "Do Not Disturb") { if ($user_status == "Do Not Disturb") {
echo " <option value='Do Not Disturb' selected='selected'>".$content_users['check-do-not-disturb-status']."</option>\n"; echo " <option value='Do Not Disturb' selected='selected'>".$text['check-do-not-disturb-status']."</option>\n";
} }
else { else {
echo " <option value='Do Not Disturb'>".$content_users['check-do-not-disturb-status']."</option>\n"; echo " <option value='Do Not Disturb'>".$text['check-do-not-disturb-status']."</option>\n";
} }
echo " </select>\n"; echo " </select>\n";
echo " <br />\n"; echo " <br />\n";
echo " ".$content_users['description-status']."<br />\n"; echo " ".$text['description-status']."<br />\n";
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";
} }
@@ -364,7 +365,7 @@ else {
echo " <tr>\n"; echo " <tr>\n";
echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n"; echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n";
echo " ".$content_users['label-time'].": \n"; echo " ".$text['label-time'].": \n";
echo " </td>\n"; echo " </td>\n";
echo " <td class=\"vtable\" align='left'>\n"; echo " <td class=\"vtable\" align='left'>\n";
echo " <select id='user_time_zone' name='user_time_zone' class='formfld' style=''>\n"; echo " <select id='user_time_zone' name='user_time_zone' class='formfld' style=''>\n";
@@ -393,7 +394,7 @@ else {
} }
echo " </select>\n"; echo " </select>\n";
echo " <br />\n"; echo " <br />\n";
echo " ".$content_users['description-timezone']."<br />\n"; echo " ".$text['description-timezone']."<br />\n";
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";
echo " </table>"; echo " </table>";
@@ -403,7 +404,7 @@ else {
echo "<table $table_width>"; echo "<table $table_width>";
echo " <tr>"; echo " <tr>";
echo " <td colspan='2' align='right'>"; echo " <td colspan='2' align='right'>";
echo " <input type='submit' name='submit' class='btn' value='".$content_users['button-save']."'>"; echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
echo " </td>"; echo " </td>";
echo " </tr>"; echo " </tr>";
echo "</table>"; echo "</table>";