Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311664

Change subject: Make the consumer registration form fields easier to understand
......................................................................

Make the consumer registration form fields easier to understand

Change-Id: I0999281b71d74f88303ac199b7aa4b18ac3818b6
---
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/64/311664/1

diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php 
b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
index 89c8215..3d4ad9f 100644
--- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
@@ -123,7 +123,10 @@
                                        'email' => array(
                                                'type' => 'text',
                                                'label-message' => 
'mwoauth-consumer-email',
-                                               'required' => true
+                                               'required' => true,
+                                               'readonly' => true,
+                                               'default' => $user->getEmail(),
+                                               'help-message' => 
'mwoauth-consumer-email-help',
                                        ),
                                        'wiki' => array(
                                                'type' => $allWikis ? 
'combobox' : 'select',
@@ -183,6 +186,7 @@
                                        'rsaKey' => array(
                                                'type' => 'textarea',
                                                'label-message' => 
'mwoauth-consumer-rsakey',
+                                               'help-message' => 
'mwoauth-consumer-rsakey-help',
                                                'required' => false,
                                                'default' => '',
                                                'rows' => 5
diff --git a/i18n/en.json b/i18n/en.json
index 943eafd..b5a26f6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,6 +20,7 @@
        "mwoauth-consumer-user": "Publisher:",
        "mwoauth-consumer-stage": "Current status:",
        "mwoauth-consumer-email": "Contact email address:",
+       "mwoauth-consumer-email-help": "Only visible to those who are approving 
new consumers",
        "mwoauth-consumer-owner-only-label": "Owner-only:",
        "mwoauth-consumer-owner-only": "This consumer is for use only by $1.",
        "mwoauth-consumer-owner-only-help": "Selecting this option will cause 
the consumer to be automatically approved and accepted for use by $1. It will 
not be usable by any other user, and the usual authorization flow will not 
function. Actions taken using this consumer will not be tagged.",
@@ -33,7 +34,8 @@
        "mwoauth-consumer-wiki-thiswiki": "Current project ($1)",
        "mwoauth-consumer-restrictions": "Usage restrictions:",
        "mwoauth-consumer-restrictions-json": "Usage restrictions (JSON):",
-       "mwoauth-consumer-rsakey": "Public RSA key:",
+       "mwoauth-consumer-rsakey": "Public RSA key (optional):",
+       "mwoauth-consumer-rsakey-help": "Enter a public key to use RSA-SHA1 
signature method. Leave empty to use HMAC-SHA1 with a random secret. If you are 
not sure which, leave it empty.",
        "mwoauth-consumer-secretkey": "Consumer secret token:",
        "mwoauth-consumer-accesstoken": "Access token:",
        "mwoauth-consumer-reason": "Reason:",
@@ -229,7 +231,7 @@
        "mwoauth-acceptance-cancelled": "You have chosen not to allow \"$1\" to 
access your account. \"$1\" will not work unless you allow it access. You can 
go back to \"$1\" or [[Special:OAuthManageMyGrants|manage]] your connected 
apps.",
        "mwoauth-granttype-normal": "Request authorization for specific 
permissions.",
        "grant-mwoauth-authonly": "Authentication only, no API access.",
-       "grant-mwoauth-authonlyprivate": "Authentication only with access to 
real name and email address via Special:OAuth/identify, no API access.",
+       "grant-mwoauth-authonlyprivate": "Authentication only with access to 
real name and email address, no API access.",
        "mwoauth-listgrants-extra-summary": "== OAuth-specific grants 
==\n\nThese additional grants are applicable to OAuth consumers.",
        "mwoauth-oauth-exception": "An error occurred in the OAuth protocol: 
$1",
        "mwoauth-callback-not-oob": "oauth_callback must be set, and must be 
set to \"oob\" (case-sensitive)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 806088e..57cb3e4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -28,6 +28,7 @@
        "mwoauth-consumer-user": "Used as label for the \"Central username\" 
box.\n{{Identical|Publisher}}",
        "mwoauth-consumer-stage": "Used as label for the \"Stage\" 
value\n\nFollowed by any one of the following messages:\n* 
{{msg-mw|Mwoauth-consumer-stage-proposed}}\n* 
{{msg-mw|Mwoauth-consumer-stage-rejected}}\n* 
{{msg-mw|Mwoauth-consumer-stage-expired}}\n* 
{{msg-mw|Mwoauth-consumer-stage-approved}}\n* 
{{msg-mw|Mwoauth-consumer-stage-disabled}}\n* 
{{msg-mw|Mwoauth-consumer-stage-suppressed}}\n{{Identical|Current status}}",
        "mwoauth-consumer-email": "Used as label for the \"Email address\" 
input box.",
+       "mwoauth-consumer-email-help": "Used as help message for the \"Email 
address\" input box, in the consumer registration form.",
        "mwoauth-consumer-owner-only-label": "Used as label for the \"Owner 
only\" field.",
        "mwoauth-consumer-owner-only": "Used as label for the \"Owner only\" 
checkbox.",
        "mwoauth-consumer-owner-only-help": "Used as help text for the \"Owner 
only\" checkbox.",
@@ -42,6 +43,7 @@
        "mwoauth-consumer-restrictions": "Used as label for the textarea. (The 
value is written in JSON format.)\n\nFollowed by the textarea or the message 
{{msg-mw|Mwoauthmanageconsumers-field-hidden}}.\n{{Identical|Usage 
restriction}}",
        "mwoauth-consumer-restrictions-json": "Used as label for the 
\"Restrictions\" textarea.\n{{Identical|Usage restriction}}",
        "mwoauth-consumer-rsakey": "Used as label for the textarea.\n\nFollowed 
by the textarea or the message {{msg-mw|Mwoauthmanageconsumers-field-hidden}}.",
+       "mwoauth-consumer-rsakey-help": "Used as help message for the textarea, 
on the consumer registration form.",
        "mwoauth-consumer-secretkey": "Used as label for the textarea.",
        "mwoauth-consumer-accesstoken": "Unused at this time.",
        "mwoauth-consumer-reason": "Used as label for the \"Reason\" 
value.\n{{Identical|Reason}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/311664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0999281b71d74f88303ac199b7aa4b18ac3818b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to