Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62808
Change subject: (bug 35288) the message
articlefeedbackv5-disable-flyover-help-location is poorly placed and not needed
anyway
......................................................................
(bug 35288) the message articlefeedbackv5-disable-flyover-help-location is
poorly placed and not needed anyway
Bug: 35288
Change-Id: I195eb8e19818ad4564da0d8c3216a1544c6f8138
---
M ArticleFeedbackv5.i18n.php
M ArticleFeedbackv5.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
3 files changed, 12 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/08/62808/1
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index ce7bbfd..a6338ea 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -701,9 +701,7 @@
/* Front-end: feedback link close button */
'articlefeedbackv5-disable-flyover-title' => 'Remove this tool?',
- 'articlefeedbackv5-disable-flyover-help' => 'To remove $1, go to $2 and
check $3',
- 'articlefeedbackv5-disable-flyover-help-emphasis-text' => 'Article
Feedback',
- 'articlefeedbackv5-disable-flyover-help-location' => 'My preferences >
Appearance',
+ 'articlefeedbackv5-disable-flyover-help-message' => 'To remove Article
Feedback, go to $1 > $2 and check $3',
'articlefeedbackv5-disable-flyover-prefbutton' => 'Go to my
preferences',
/* Custom AbuseFilter actions */
@@ -2094,16 +2092,12 @@
* $3 – URL directly to feedback location
* $4 – The help link',
'articlefeedbackv5-disable-flyover-title' => 'Title of the tooltip that
pops up when you click the close button on a feedback trigger link, explaining
how to remove the Article Feedback tool',
- 'articlefeedbackv5-disable-flyover-help' => 'Help text for the tooltip
that pops up when you click the close button on a feedback trigger link,
explaining how to remove the Article Feedback tool.
+ 'articlefeedbackv5-disable-flyover-help-message' => 'Help text for the
tooltip that pops up when you click the close button on a feedback trigger
link, explaining how to remove the Article Feedback tool.
Parameters:
-* $1 - Emphasized name of the tool
({{msg-mw|articlefeedbackv5-disable-flyover-help-emphasis-text}})
-* $2 - The location of the preference panel
({{msg-mw|articlefeedbackv5-disable-flyover-help-location}})
-* $3 - The label of the checkbox (
{{msg-mw|articlefeedbackv5-disable-preference}})',
- 'articlefeedbackv5-disable-flyover-help-emphasis-text' => 'The emphasis
text for {{msg-mw|articlefeedbackv5-disable-flyover-help}} (the name of the
tool)',
- 'articlefeedbackv5-disable-flyover-help-location' => 'A short
indication of where to go to change your Article Feedback preferences, inside
{{msg-mw|articlefeedbackv5-disable-flyover-help}}.
-
-It must be: {{msg-mw|mypreferences}} > {{msg-mw|prefs-rendering}}',
+* $1 - Reference to preferences: {{msg-mw|mypreferences}}
+* $2 - Reference to the preference\'s appearance panel:
{{msg-mw|prefs-rendering}}
+* $3 - The label of the checkbox:
{{msg-mw|articlefeedbackv5-disable-preference}}',
'articlefeedbackv5-disable-flyover-prefbutton' => 'The text of the big
glossy button used to send the user to their preferences in the tooltip that
pops up when you click the close button on a feedback trigger link, explaining
how to remove the Article Feedback tool',
'abusefilter-edit-action-aftv5flagabuse' => 'The text for the checkbox
used by Special:AbuseFilter to indicate that a rule should result in the
feedback being auto-flagged as abuse',
'articlefeedbackv5-abusefilter-note-aftv5flagabuse' => 'The note to add
to the activity log when auto-flagging a new feedback post as abuse
(<code>$1</code> is the name of the filter)',
diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
index 0cae785..31fb0a1 100644
--- a/ArticleFeedbackv5.php
+++ b/ArticleFeedbackv5.php
@@ -673,13 +673,12 @@
'articlefeedbackv5-help-transparency-terms',
'parentheses',
'articlefeedbackv5-disable-flyover-title',
- 'articlefeedbackv5-disable-flyover-help',
- 'articlefeedbackv5-disable-flyover-help-emphasis-text',
- 'articlefeedbackv5-disable-flyover-help-location',
- 'articlefeedbackv5-disable-flyover-help-direction',
+ 'articlefeedbackv5-disable-flyover-help-message',
'articlefeedbackv5-disable-flyover-prefbutton',
'articlefeedbackv5-disable-preference',
'pipe-separator',
+ 'mypreferences',
+ 'prefs-rendering',
),
'dependencies' => array(
'jquery.appear',
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index 91169e8..9eaa40e 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -2940,12 +2940,12 @@
$flyover.find(
'.articleFeedbackv5-disable-flyover-help' )
.html(
$.articleFeedbackv5.buildLink(
-
'articlefeedbackv5-disable-flyover-help', {
- tag: 'strong',
- text:
'articlefeedbackv5-disable-flyover-help-emphasis-text'
+
'articlefeedbackv5-disable-flyover-help-message', {
+ tag: 'quotes',
+ text:
'prefs-rendering'
}, {
tag: 'quotes',
- text:
'articlefeedbackv5-disable-flyover-help-location'
+ text:
'mypreferences'
}, {
tag: 'quotes',
text:
'articlefeedbackv5-disable-preference'
--
To view, visit https://gerrit.wikimedia.org/r/62808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I195eb8e19818ad4564da0d8c3216a1544c6f8138
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
