Anomie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328680 )
Change subject: When authorizing, differentiate mwoauth-authonlyprivate from
mwoauth-authonly or basic
......................................................................
When authorizing, differentiate mwoauth-authonlyprivate from mwoauth-authonly
or basic
People have expressed concern that the authorization message is the same
when giving access to your email address and when not doing so.
Change-Id: Idf4618977f172dfa538ef7a4a6ef15e808f2c593
---
M frontend/specialpages/SpecialMWOAuth.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 15 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth
refs/changes/80/328680/1
diff --git a/frontend/specialpages/SpecialMWOAuth.php
b/frontend/specialpages/SpecialMWOAuth.php
index 0842190..f4cd634 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -383,6 +383,8 @@
// * mwoauth-form-description-onewiki
// * mwoauth-form-description-allwikis-nogrants
// * mwoauth-form-description-onewiki-nogrants
+ // * mwoauth-form-description-allwikis-privateinfo
+ // * mwoauth-form-description-onewiki-privateinfo
$msgKey = 'mwoauth-form-description';
$params = [
$this->getUser()->getName(),
@@ -397,7 +399,11 @@
}
$grantsText = \MWGrants::getGrantsWikiText( $cmr->get( 'grants'
), $this->getLanguage() );
if ( $grantsText === "\n" ) {
- $msgKey .= '-nogrants';
+ if ( in_array( 'mwoauth-authonlyprivate', $cmr->get(
'grants' ), true ) ) {
+ $msgKey .= '-privateinfo';
+ } else {
+ $msgKey .= '-nogrants';
+ }
} else {
$params[] = $grantsText;
}
diff --git a/i18n/en.json b/i18n/en.json
index 23a95d7..7adcf5e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -220,6 +220,8 @@
"mwoauth-form-description-onewiki": "Hi $1,\n\nIn order to complete
your request, '''$2''' needs permission to perform the following actions on
your behalf on ''$4'':\n\n$5",
"mwoauth-form-description-allwikis-nogrants": "Hi $1,\n\nIn order to
complete your request, '''$2''' needs permission to access information on all
projects of this site on your behalf. No changes will be made with your
account.",
"mwoauth-form-description-onewiki-nogrants": "Hi $1,\n\nIn order to
complete your request, '''$2''' needs permission to access information on
''$4'' on your behalf. No changes will be made with your account.",
+ "mwoauth-form-description-allwikis-privateinfo": "Hi $1,\n\nIn order to
complete your request, '''$2''' needs permission to access information about
you, including your real name and email address, on all projects of this site.
No changes will be made with your account.",
+ "mwoauth-form-description-onewiki-privateinfo": "Hi $1,\n\nIn order to
complete your request, '''$2''' needs permission to access information,
including your real name and email address, on ''$4''. No changes will be made
with your account.",
"mwoauth-form-legal": "",
"mwoauth-form-button-approve": "Allow",
"mwoauth-form-button-cancel": "Cancel",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9276133..2391c7d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -225,10 +225,12 @@
"mwoauth-invalid-authorization-wrong-user": "Text of the error page
when the Authorization header is for the wrong user",
"mwoauth-invalid-authorization-not-approved": "Text of the error page
when the Authorization header is for a consumer that isn't
approved.\n\nParameters:\n* $1 - ...",
"mwoauth-invalid-authorization-blocked-user": "Text of the error page
when Authorization header is for a user who is blocked",
- "mwoauth-form-description-allwikis": "Description of a form requesting
the user authorize an OAuth consumer to use MediaWiki on their
behalf.\n\nParameters:\n* $1 - the username\n* $2 - application name\n* $3 -
application publisher\n* $4 - formatted list of grants\nSee also:\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}",
- "mwoauth-form-description-onewiki": "Description of a form requesting
the user authorize an OAuth consumer to use MediaWiki on their behalf, without
any non-hidden grants.\n\nParameters:\n* $1 - the username\n* $2 - application
name\n* $3 - application publisher\n* $4 - wiki project name\nSee also:\n*
{{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-nogrants}}",
- "mwoauth-form-description-allwikis-nogrants": "Description of a form
requesting the user authorize an OAuth consumer to use MediaWiki on their
behalf, without any non-hidden grants.\n\nParameters:\n* $1 - the username\n*
$2 - application name\n* $3 - application publisher\nSee also:\n*
{{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}",
- "mwoauth-form-description-onewiki-nogrants": "Description of a form
requesting the user authorize an OAuth consumer to use MediaWiki on their
behalf, without any non-hidden grants.\n\nParameters:\n* $1 - the username\n*
$2 - application name\n* $3 - application publisher\n* $4 - wiki project
name\nSee also:\n* {{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}",
+ "mwoauth-form-description-allwikis": "Description of a form requesting
the user authorize an OAuth consumer to use MediaWiki on their
behalf.\n\nParameters:\n* $1 - the username\n* $2 - application name\n* $3 -
application publisher\n* $4 - formatted list of grants\nSee also:\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-privateinfo}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-privateinfo}}",
+ "mwoauth-form-description-onewiki": "Description of a form requesting
the user authorize an OAuth consumer to use MediaWiki on their behalf, without
any non-hidden grants.\n\nParameters:\n* $1 - the username\n* $2 - application
name\n* $3 - application publisher\n* $4 - wiki project name\nSee also:\n*
{{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-privateinfo}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-privateinfo}}",
+ "mwoauth-form-description-allwikis-nogrants": "Description of a form
requesting the user authorize an OAuth consumer to use MediaWiki on their
behalf, without any non-hidden grants.\n\nParameters:\n* $1 - the username\n*
$2 - application name\n* $3 - application publisher\nSee also:\n*
{{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-privateinfo}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-privateinfo}}",
+ "mwoauth-form-description-onewiki-nogrants": "Description of a form
requesting the user authorize an OAuth consumer to use MediaWiki on their
behalf, without any non-hidden grants.\n\nParameters:\n* $1 - the username\n*
$2 - application name\n* $3 - application publisher\n* $4 - wiki project
name\nSee also:\n* {{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-privateinfo}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-privateinfo}}",
+ "mwoauth-form-description-allwikis-privateinfo": "Description of a form
requesting the user authorize an OAuth consumer to access private information
about the user but with no grants. The language should parallel
{{msg-mw|grant-mwoauth-authonlyprivate}}.\n\nParameters:\n* $1 - the
username\n* $2 - application name\n* $3 - application publisher\nSee also:\n*
{{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-privateinfo}}}",
+ "mwoauth-form-description-onewiki-privateinfo": "Description of a form
requesting the user authorize an OAuth consumer to access private information
about the user but with no grants. The language should parallel
{{msg-mw|grant-mwoauth-authonlyprivate}}.\n\nParameters:\n* $1 - the
username\n* $2 - application name\n* $3 - application publisher\n* $4 - wiki
project name\nSee also:\n* {{msg-mw|Mwoauth-form-description-allwikis}}\n*
{{msg-mw|Mwoauth-form-description-onewiki}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-onewiki-nogrants}}\n*
{{msg-mw|Mwoauth-form-description-allwikis-privateinfo}}",
"mwoauth-form-legal": "Message used for wiki-specific legal notes. Keep
this blank.",
"mwoauth-form-button-approve": "Button label, indicating the user wants
to allow access.\n\nSee also:\n*
{{msg-mw|Mwoauth-form-button-cancel}}\n{{Identical|Allow}}",
"mwoauth-form-button-cancel": "Button label, indicating the user wants
to cancel granting access.\n\nSee also:\n*
{{msg-mw|Mwoauth-form-button-approve}}\n{{Identical|Cancel}}",
--
To view, visit https://gerrit.wikimedia.org/r/328680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf4618977f172dfa538ef7a4a6ef15e808f2c593
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
