Selaa lähdekoodia

Fixed regression introduced with "forgot password": button to reset the user password labelled as "Send now!"

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2965 a333f486-631f-4898-b8df-5754b55c2be0
romainq 11 vuotta sitten
vanhempi
commit
80bac465b4

+ 1 - 1
application/loginwebpage.class.inc.php

@@ -196,7 +196,7 @@ class LoginWebPage extends NiceWebPage
 		$this->add("<form method=\"post\">\n");
 		$this->add("<table>\n");
 		$this->add("<tr><td colspan=\"2\" class=\"center\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
-		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"button\" onClick=\"window.close();\" value=\"".Dict::S('UI:Button:Cancel')."\" /></span>&nbsp;&nbsp;<span class=\"btn_border\"><input type=\"submit\" value=\"".Dict::S('UI:Button:ResetPassword')."\" /></span></td></tr>\n");
+		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"button\" onClick=\"window.close();\" value=\"".Dict::S('UI:Button:Cancel')."\" /></span>&nbsp;&nbsp;<span class=\"btn_border\"><input type=\"submit\" value=\"".Dict::S('UI:Login:ResetPassword')."\" /></span></td></tr>\n");
 		$this->add("</table>\n");
 		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"forgot_pwd_go\" />\n");
 		$this->add("</form>\n");

+ 1 - 1
dictionaries/dictionary.itop.ui.php

@@ -482,7 +482,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Login:ForgotPwd' => 'Forgot your password?',
 	'UI:Login:ForgotPwdForm' => 'Forgot your password',
 	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.',
-	'UI:Button:ResetPassword' => 'Send now!',
+	'UI:Login:ResetPassword' => 'Send now!',
 	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s',
 
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login',

+ 1 - 1
dictionaries/fr.dictionary.itop.ui.php

@@ -358,7 +358,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Login:ForgotPwd' => 'Mot de passe oublié ?',
 	'UI:Login:ForgotPwdForm' => 'Mot de passe oublié',
 	'UI:Login:ForgotPwdForm+' => 'Vous pouvez demander à saisir d\'un nouveau mot de passe. Vous allez recevoir un email et vous pourrez suivre les instructions.',
-	'UI:Button:ResetPassword' => 'Envoyer le message',
+	'UI:Login:ResetPassword' => 'Envoyer le message',
 	'UI:Login:ResetPwdFailed' => 'Impossible de vous faire parvenir le message: %1$s',
 
 	'UI:ResetPwd-Error-WrongLogin' => 'le compte \'%1$s\' est inconnu.',