From c6fa71125dd012c4e5a5972842c2a1db31ff2677 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 5 Jan 2013 10:06:32 +0000 Subject: [PATCH] Make the login.php use the correct app_languages.php file. Reason to do this is because login.php in the root is put in a position as being part of the core so I wanted the translations to be part of the core as well. And user settings is related to the user login. App/login is in the app directory to make the login and logout as an optional part of the menu since they could be incorporated in the theme. --- core/user_settings/app_languages.php | 9 ++++++--- login.php | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php index 8e4890950b..403288b6cc 100644 --- a/core/user_settings/app_languages.php +++ b/core/user_settings/app_languages.php @@ -21,6 +21,12 @@ $text['label-password']['en-us'] = 'Password'; $text['label-password']['pt-pt'] = 'Palavra passe'; + $text['label-domain']['en-us'] = 'Domain'; + $text['label-domain']['pt-pt'] = ''; + + $text['button-login']['en-us'] = 'Login'; + $text['button-login']['pt-pt'] = ''; + $text['label-confirm-password']['en-us'] = 'Confirm Password'; $text['label-confirm-password']['pt-pt'] = 'Confirme Palavra Chave'; @@ -66,9 +72,6 @@ $text['title-user-settings']['en-us'] = 'User Information'; $text['title-user-settings']['pt-pt'] = 'Informação do Utilizador'; - $text['label-username']['en-us'] = 'User Name'; - $text['label-username']['pt-pt'] = 'Nome do Utilizador'; - $text['label-voicemail']['en-us'] = 'Voicemail'; $text['label-voicemail']['pt-pt'] = 'Correio de Voz'; diff --git a/login.php b/login.php index 6d834bc1b4..9c28d6adce 100644 --- a/login.php +++ b/login.php @@ -34,9 +34,7 @@ include "root.php"; require_once "includes/require.php"; //add multi-lingual support - echo "\n"; + require_once "core/user_settings/app_languages.php"; foreach($text as $key => $value) { $text[$key] = $value[$_SESSION['domain']['language']['code']]; }