From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Wed, 12 Mar 2014 18:12:10 +0000 (+0100)
Subject: Prevent "Log in" being used in two different contexts
X-Git-Tag: 1.31.0-rc.0~16622^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=bae9f58d1acd7966ce8c052d5083281f05f8f59d;p=lhc%2Fweb%2Fwiklou.git

Prevent "Log in" being used in two different contexts

Spotted by Lloffiwr and reported at
https://translatewiki.net/wiki/Thread:Support/MediaWiki:Pt-login/en

Change-Id: Ibfbe4abfbb29860c05ebaac83e2220f373940a59
---

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 68097e32b0..c416d1130d 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -146,7 +146,7 @@ class UserloginTemplate extends BaseTemplate {
 
 			<div>
 				<?php
-				echo Html::input( 'wpLoginAttempt', $this->getMsg( 'pt-login' )->text(), 'submit', array(
+				echo Html::input( 'wpLoginAttempt', $this->getMsg( 'pt-login-button' )->text(), 'submit', array(
 					'id' => 'wpLoginAttempt',
 					'tabindex' => '6',
 					'class' => 'mw-ui-button mw-ui-big mw-ui-block mw-ui-constructive'
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c78548694c..c09e7c7c52 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1252,6 +1252,7 @@ Please wait $1 before trying again.',
 'createacct-another-realname-tip' => 'Real name is optional.
 If you choose to provide it, this will be used for giving the user attribution for their work.',
 'pt-login'                        => 'Log in',
+'pt-login-button'                 => 'Log in',
 'pt-createaccount'                => 'Create account',
 'pt-userlogout'                   => 'Log out',
 
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 6ebacd4a42..61c7972889 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1579,7 +1579,9 @@ This message is used in html.
 'createacct-another-realname-tip' => "{{doc-singularthey}}
 Used on the account creation form when creating another user's account. Similar to {{msg-mw|prefs-help-realname}}.
 {{Identical|Real name attribution}}",
-'pt-login' => "Shown as the caption of the button at [[Special:UserLogin]], and also to anonymous users in the upper right corner of the page when they can't create an account (otherwise the message {{msg-mw|nav-login-createaccount}} is shown there)
+'pt-login' => "Shown to anonymous users in the upper right corner of the page when they can't create an account (otherwise the message {{msg-mw|nav-login-createaccount}} is shown there).
+{{Identical|Log in}}",
+'pt-login-button' => "Shown as the caption of the button at [[Special:UserLogin]].
 {{Identical|Log in}}",
 'pt-createaccount' => 'Used on the top of the page for logged out users, where it appears next to {{msg-mw|login}}, so consider making them similar.
 {{Identical|Create account}}',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 60cc3a888f..c11d6aaae6 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -558,6 +558,7 @@ $wgMessageStructure = array(
 		'suspicious-userlogout',
 		'createacct-another-realname-tip',
 		'pt-login',
+		'pt-login-button',
 		'pt-createaccount',
 		'pt-userlogout',
 	),