瀏覽代碼

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.

Mark Crane 12 年之前
父節點
當前提交
8ed5a9e86a
共有 2 個文件被更改,包括 7 次插入6 次删除
  1. 6 3
      core/user_settings/app_languages.php
  2. 1 3
      login.php

+ 6 - 3
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';
 

+ 1 - 3
login.php

@@ -34,9 +34,7 @@ include "root.php";
 	require_once "includes/require.php";
 
 //add multi-lingual support
-	echo "<!--\n";
-	require_once "core/login/app_languages.php";
-	echo "-->\n";
+	require_once "core/user_settings/app_languages.php";
 	foreach($text as $key => $value) {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}