jenkins-bot has submitted this change and it was merged.
Change subject: Add comments for grep
......................................................................
Add comments for grep
Change-Id: I5bdfc05e4cd0535639f85ab40f88012a6f52868f
---
M ArticleFeedbackv5.log.php
M ArticleFeedbackv5.render.php
M ArticleFeedbackv5.utils.php
M SpecialArticleFeedbackv5.php
M SpecialArticleFeedbackv5Watchlist.php
M api/ApiViewActivityArticleFeedbackv5.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
7 files changed, 136 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ArticleFeedbackv5.log.php b/ArticleFeedbackv5.log.php
index 1ebc7c4..9a7c101 100644
--- a/ArticleFeedbackv5.log.php
+++ b/ArticleFeedbackv5.log.php
@@ -114,6 +114,16 @@
return '';
}
+ // Give grep a chance to find the usages:
+ // logentry-articlefeedbackv5-create,
logentry-articlefeedbackv5-oversight, logentry-articlefeedbackv5-unoversight,
+ // logentry-articlefeedbackv5-decline,
logentry-articlefeedbackv5-request, logentry-articlefeedbackv5-unrequest,
+ // logentry-articlefeedbackv5-flag,
logentry-articlefeedbackv5-unflag, logentry-articlefeedbackv5-autoflag,
+ // logentry-articlefeedbackv5-feature,
logentry-articlefeedbackv5-unfeature, logentry-articlefeedbackv5-resolve,
+ // logentry-articlefeedbackv5-unresolve,
logentry-articlefeedbackv5-noaction, logentry-articlefeedbackv5-unnoaction,
+ // logentry-articlefeedbackv5-inappropriate,
logentry-articlefeedbackv5-uninappropriate, logentry-articlefeedbackv5-archive,
+ // logentry-articlefeedbackv5-unarchive,
logentry-articlefeedbackv5-hide, logentry-articlefeedbackv5-unhide,
+ // logentry-articlefeedbackv5-autohide,
logentry-articlefeedbackv5-helpful, logentry-articlefeedbackv5-unhelpful,
+ // logentry-articlefeedbackv5-undo-helpful,
logentry-articlefeedbackv5-undo-unhelpful,
logentry-articlefeedbackv5-clear-flags
$language = $skin === null ? $wgContLang : $wgLang;
return wfMessage( "logentry-articlefeedbackv5-$action" )
->params( array(
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 9589e25..f6adce6 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -702,6 +702,8 @@
}
if ( $action ) {
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-form-tooltip-hide-own,
articlefeedbackv5-form-tooltip-unhide-own
$ownPost =
Html::rawElement(
'div',
@@ -759,6 +761,10 @@
return '';
}
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-new-marker,
articlefeedbackv5-oversight-marker, articlefeedbackv5-autohide-marker,
+ // articlefeedbackv5-hide-marker,
articlefeedbackv5-feature-marker, articlefeedbackv5-resolve-marker,
+ // articlefeedbackv5-noaction-marker,
articlefeedbackv5-inappropriate-marker, articlefeedbackv5-archive-marker
return
Html::rawElement(
'div',
@@ -844,6 +850,8 @@
if ( $discussPage ) {
global $wgLang, $wgUser;
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-discuss-talk-section-title,
articlefeedbackv5-discuss-user-section-title
$sectionTitle = wfMessage(
"articlefeedbackv5-discuss-$discussType-section-title" )
->params( $record->aft_comment,
$record->getArticle()->getTitle() )
->inContentLanguage()
@@ -863,6 +871,8 @@
*/
$sectionTitleTruncated =
$wgLang->truncate( $sectionTitle, 48 );
}
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-discuss-talk-section-content,
articlefeedbackv5-discuss-user-section-content
$sectionContent = wfMessage(
"articlefeedbackv5-discuss-$discussType-section-content" )
->inContentLanguage()
->params(
@@ -902,6 +912,8 @@
$class .= "
articleFeedbackv5-$action-exists-link";
}
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-form-tooltip-discuss-talk,
articlefeedbackv5-form-tooltip-discuss-user
$tools .= Html::rawElement(
'li',
array(),
@@ -1007,6 +1019,20 @@
$toolbox .=
// performer/action info
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-short-status-request,
articlefeedbackv5-short-status-unrequest,
+ //
articlefeedbackv5-short-status-decline, articlefeedbackv5-short-status-autohide,
+ //
articlefeedbackv5-short-status-oversight,
articlefeedbackv5-short-status-unoversight,
+ //
articlefeedbackv5-short-status-unflag, articlefeedbackv5-short-status-flag,
+ //
articlefeedbackv5-short-status-autoflag, articlefeedbackv5-short-status-feature,
+ //
articlefeedbackv5-short-status-unfeature,
articlefeedbackv5-short-status-resolve,
+ //
articlefeedbackv5-short-status-unresolve,
articlefeedbackv5-short-status-noaction,
+ //
articlefeedbackv5-short-status-unnoaction,
articlefeedbackv5-short-status-inappropriate,
+ //
articlefeedbackv5-short-status-uninappropriate,
articlefeedbackv5-short-status-hide,
+ //
articlefeedbackv5-short-status-unhide, articlefeedbackv5-short-status-archive,
+ //
articlefeedbackv5-short-status-unarchive,
articlefeedbackv5-short-status-helpful,
+ //
articlefeedbackv5-short-status-undo-helpful,
articlefeedbackv5-short-status-unhelpful,
+ //
articlefeedbackv5-short-status-undo-unhelpful
Html::rawElement(
'div',
array( 'class' =>
"articleFeedbackv5-feedback-tools-details" ),
@@ -1075,6 +1101,8 @@
Html::rawElement(
'p',
array(),
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-permalink-written-by-reader,
articlefeedbackv5-permalink-written-by-editor
wfMessage(
'articlefeedbackv5-permalink-written-by-' . ( $record->aft_user == 0 ? 'reader'
: 'editor' ) )
->params(
$record->getExperiment() )
->parse()
@@ -1183,6 +1211,20 @@
);
}
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-permalink-status-request,
articlefeedbackv5-permalink-status-unrequest,
+ // articlefeedbackv5-permalink-status-decline,
articlefeedbackv5-permalink-status-autohide,
+ // articlefeedbackv5-permalink-status-oversight,
articlefeedbackv5-permalink-status-unoversight,
+ // articlefeedbackv5-permalink-status-flag,
articlefeedbackv5-permalink-status-unflag,
+ // articlefeedbackv5-permalink-status-autoflag,
articlefeedbackv5-permalink-status-feature,
+ // articlefeedbackv5-permalink-status-unfeature,
articlefeedbackv5-permalink-status-resolve,
+ // articlefeedbackv5-permalink-status-unresolve,
articlefeedbackv5-permalink-status-noaction,
+ // articlefeedbackv5-permalink-status-unnoaction,
articlefeedbackv5-permalink-status-inappropriate,
+ // articlefeedbackv5-permalink-status-uninappropriate,
articlefeedbackv5-permalink-status-archive,
+ // articlefeedbackv5-permalink-status-unarchive,
articlefeedbackv5-permalink-status-hide,
+ // articlefeedbackv5-permalink-status-unhide,
articlefeedbackv5-permalink-status-helpful,
+ // articlefeedbackv5-permalink-status-undo-helpful,
articlefeedbackv5-permalink-status-unhelpful,
+ // articlefeedbackv5-permalink-status-undo-unhelpful
$activity =
Html::rawElement(
'p',
@@ -1282,6 +1324,28 @@
return '';
}
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-form-tooltip-note,
articlefeedbackv5-form-tooltip-feature,
+ // articlefeedbackv5-form-tooltip-unfeature,
articlefeedbackv5-form-tooltip-resolve,
+ // articlefeedbackv5-form-tooltip-unresolve,
articlefeedbackv5-form-tooltip-noaction,
+ // articlefeedbackv5-form-tooltip-unnoaction,
articlefeedbackv5-form-tooltip-inappropriate,
+ // articlefeedbackv5-form-tooltip-uninappropriate,
articlefeedbackv5-form-tooltip-hide,
+ // articlefeedbackv5-form-tooltip-unhide,
articlefeedbackv5-form-tooltip-hide-own,
+ // articlefeedbackv5-form-tooltip-unhide-own,
articlefeedbackv5-form-tooltip-archive,
+ // articlefeedbackv5-form-tooltip-unarchive,
articlefeedbackv5-form-tooltip-flag,
+ // articlefeedbackv5-form-tooltip-oversight,
articlefeedbackv5-form-tooltip-unoversight,
+ // articlefeedbackv5-form-tooltip-request,
articlefeedbackv5-form-tooltip-unrequest,
+ // articlefeedbackv5-form-tooltip-decline,
articlefeedbackv5-form-tooltip-discuss-talk,
+ // articlefeedbackv5-form-tooltip-discuss-user
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-form-note,
articlefeedbackv5-form-feature, articlefeedbackv5-form-unfeature,
+ // articlefeedbackv5-form-resolve,
articlefeedbackv5-form-unresolve, articlefeedbackv5-form-noaction,
+ // articlefeedbackv5-form-unnoaction,
articlefeedbackv5-form-inappropriate, articlefeedbackv5-form-uninappropriate,
+ // articlefeedbackv5-form-hide,
articlefeedbackv5-form-unhide, articlefeedbackv5-form-hide-own,
+ // articlefeedbackv5-form-unhide-own,
articlefeedbackv5-form-archive, articlefeedbackv5-form-unarchive,
+ // articlefeedbackv5-form-flag,
articlefeedbackv5-form-oversight, articlefeedbackv5-form-unoversight,
+ // articlefeedbackv5-form-request,
articlefeedbackv5-form-unrequest, articlefeedbackv5-form-decline,
+ // articlefeedbackv5-form-discuss-talk,
articlefeedbackv5-form-discuss-user
return Html::rawElement(
'li',
array(),
diff --git a/ArticleFeedbackv5.utils.php b/ArticleFeedbackv5.utils.php
index e5ad3dd..bf6ad29 100644
--- a/ArticleFeedbackv5.utils.php
+++ b/ArticleFeedbackv5.utils.php
@@ -251,6 +251,9 @@
}
$timestamp = new MWTimestamp( $timestamp );
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-mask-text-oversight,
articlefeedbackv5-mask-text-hide,
+ // articlefeedbackv5-mask-text-inappropriate
return wfMessage( 'articlefeedbackv5-mask-text-' . $type )
->params( static::formatId( $feedbackId ), $username )
->rawParams( $timestamp->getHumanTimestamp()->escaped()
)
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index a550ab6..4f4fd1b 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -109,6 +109,19 @@
$out->setIndexPolicy( 'noindex' );
// these are messages that require some parsing that the
current JS mw.msg does not yet support
+ // articlefeedbackv5-noteflyover-helpful,
articlefeedbackv5-noteflyover-undo-helpful,
+ // articlefeedbackv5-noteflyover-unhelpful,
articlefeedbackv5-noteflyover-undo-unhelpful,
+ // articlefeedbackv5-noteflyover-flag,
articlefeedbackv5-noteflyover-unflag,
+ // articlefeedbackv5-noteflyover-autoflag,
articlefeedbackv5-noteflyover-clear-flags,
+ // articlefeedbackv5-noteflyover-feature,
articlefeedbackv5-noteflyover-unfeature,
+ // articlefeedbackv5-noteflyover-resolve,
articlefeedbackv5-noteflyover-unresolve,
+ // articlefeedbackv5-noteflyover-noaction,
articlefeedbackv5-noteflyover-unnoaction,
+ // articlefeedbackv5-noteflyover-inappropriate,
articlefeedbackv5-noteflyover-uninappropriate,
+ // articlefeedbackv5-noteflyover-archive,
articlefeedbackv5-noteflyover-unarchive,
+ // articlefeedbackv5-noteflyover-hide,
articlefeedbackv5-noteflyover-unhide,
+ // articlefeedbackv5-noteflyover-autohide,
articlefeedbackv5-noteflyover-request,
+ // articlefeedbackv5-noteflyover-unrequest,
articlefeedbackv5-noteflyover-decline,
+ // articlefeedbackv5-noteflyover-oversight,
articlefeedbackv5-noteflyover-unoversight
$vars = array();
foreach ( ArticleFeedbackv5Activity::$actions as $action =>
$options ) {
$message = wfMessage(
"articlefeedbackv5-noteflyover-$action-description" )->parse();
@@ -537,6 +550,8 @@
foreach ( array( 'featured', 'unreviewed' ) as $filter ) {
$count = ArticleFeedbackv5Model::getCount( $filter,
$this->pageId );
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-special-filter-featured,
articlefeedbackv5-special-filter-unreviewed
$filterLabels[$filter] =
Html::rawElement(
'a',
@@ -554,6 +569,16 @@
if ( $this->isAllowed( 'aft-editor' ) ) {
$opts = array();
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-special-filter-featured,
rticlefeedbackv5-special-filter-unreviewed,
+ // articlefeedbackv5-special-filter-helpful,
articlefeedbackv5-special-filter-unhelpful,
+ // articlefeedbackv5-special-filter-flagged,
articlefeedbackv5-special-filter-useful,
+ // articlefeedbackv5-special-filter-resolved,
articlefeedbackv5-special-filter-noaction,
+ // articlefeedbackv5-special-filter-inappropriate,
articlefeedbackv5-special-filter-archived,
+ // articlefeedbackv5-special-filter-allcomment,
articlefeedbackv5-special-filter-hidden,
+ // articlefeedbackv5-special-filter-requested,
articlefeedbackv5-special-filter-declined,
+ // articlefeedbackv5-special-filter-oversighted,
+ // articlefeedbackv5-special-filter-all
foreach ( $this->filters as $filter ) {
if ( in_array( $filter, array_keys(
$filterLabels ) ) ) {
continue;
@@ -603,6 +628,11 @@
*/
protected function buildSort() {
// Sorting
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-special-sort-relevance-desc,
articlefeedbackv5-special-sort-relevance-asc,
+ // articlefeedbackv5-special-sort-helpful-desc,
articlefeedbackv5-special-sort-helpful-asc,
+ // articlefeedbackv5-special-sort-age-desc,
articlefeedbackv5-special-sort-age-asc,
+ // articlefeedbackv5-special-sort-label-before,
articlefeedbackv5-special-sort-label-after
$opts = array();
foreach ( $this->sorts as $i => $sort ) {
if ( $i % 2 == 0 && $i > 0 ) {
diff --git a/SpecialArticleFeedbackv5Watchlist.php
b/SpecialArticleFeedbackv5Watchlist.php
index 34c21b6..7bbe1c5 100644
--- a/SpecialArticleFeedbackv5Watchlist.php
+++ b/SpecialArticleFeedbackv5Watchlist.php
@@ -101,6 +101,8 @@
// filter to be displayed as link
$filterLabels = array();
foreach ( array( 'featured', 'unreviewed' ) as $filter ) {
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-special-filter-featured,
articlefeedbackv5-special-filter-unreviewed
$filterLabels[$filter] =
Html::rawElement(
'a',
@@ -118,6 +120,15 @@
if ( $this->isAllowed( 'aft-editor' ) ) {
$opts = array();
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-special-filter-featured-watchlist,
articlefeedbackv5-special-filter-unreviewed-watchlist,
+ // articlefeedbackv5-special-filter-helpful-watchlist,
articlefeedbackv5-special-filter-unhelpful-watchlist,
+ // articlefeedbackv5-special-filter-flagged-watchlist,
articlefeedbackv5-special-filter-useful-watchlist,
+ // articlefeedbackv5-special-filter-resolved-watchlist,
articlefeedbackv5-special-filter-noaction-watchlist,
+ //
articlefeedbackv5-special-filter-inappropriate-watchlist,
articlefeedbackv5-special-filter-archived-watchlist,
+ //
articlefeedbackv5-special-filter-allcomment-watchlist,
articlefeedbackv5-special-filter-hidden-watchlist,
+ //
articlefeedbackv5-special-filter-requested-watchlist,
articlefeedbackv5-special-filter-declined-watchlist,
+ //
articlefeedbackv5-special-filter-oversighted-watchlist,
articlefeedbackv5-special-filter-all-watchlist
foreach ( $this->filters as $filter ) {
if ( in_array( $filter, array_keys(
$filterLabels ) ) ) {
continue;
diff --git a/api/ApiViewActivityArticleFeedbackv5.php
b/api/ApiViewActivityArticleFeedbackv5.php
index e1dc639..3452bd4 100644
--- a/api/ApiViewActivityArticleFeedbackv5.php
+++ b/api/ApiViewActivityArticleFeedbackv5.php
@@ -131,6 +131,20 @@
$sentiment =
ArticleFeedbackv5Activity::$actions[$item->log_action]['sentiment'];
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-activity-item-request,
articlefeedbackv5-activity-item-unrequest,
+ // articlefeedbackv5-activity-item-decline,
articlefeedbackv5-activity-item-flag,
+ // articlefeedbackv5-activity-item-unflag,
articlefeedbackv5-activity-item-autoflag,
+ // articlefeedbackv5-activity-item-oversight,
articlefeedbackv5-activity-item-unoversight,
+ // articlefeedbackv5-activity-item-feature,
articlefeedbackv5-activity-item-unfeature,
+ // articlefeedbackv5-activity-item-resolve,
articlefeedbackv5-activity-item-unresolve,
+ // articlefeedbackv5-activity-item-noaction,
articlefeedbackv5-activity-item-unnoaction,
+ // articlefeedbackv5-activity-item-inappropriate,
articlefeedbackv5-activity-item-uninappropriate,
+ // articlefeedbackv5-activity-item-hide,
articlefeedbackv5-activity-item-unhide,
+ // articlefeedbackv5-activity-item-autohide,
articlefeedbackv5-activity-item-archive,
+ // articlefeedbackv5-activity-item-unarchive,
articlefeedbackv5-activity-item-helpful,
+ // articlefeedbackv5-activity-item-unhelpful,
articlefeedbackv5-activity-item-undo-helpful,
+ // articlefeedbackv5-activity-item-undo-unhelpful,
articlefeedbackv5-activity-item-clear-flags
$html .=
Html::rawElement(
'div',
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index 805d568..91169e8 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -739,6 +739,8 @@
$.articleFeedbackv5.currentBucket().displayStep2( $block );
// add instructional text for
feedback
+ // Give grep a chance to find
the usages:
+ //
articlefeedbackv5-bucket6-question-instructions-yes,
articlefeedbackv5-bucket6-question-instructions-no
$( '.articleFeedbackv5-title'
).text( mw.msg( 'articlefeedbackv5-bucket6-question-instructions-' + new_val )
);
// make the button blue
@@ -749,6 +751,8 @@
$wrap.find( 'input' ).trigger(
'click' ).attr( 'checked', true );
// set default comment message
+ // Give grep a chance to find
the usages:
+ //
articlefeedbackv5-bucket6-question-placeholder-yes,
articlefeedbackv5-bucket6-question-placeholder-no
var $element =
$.articleFeedbackv5.$holder.find( '.articleFeedbackv5-comment textarea' );
var text = mw.msg(
'articlefeedbackv5-bucket6-question-placeholder-' + new_val );
$element.attr( 'placeholder',
text ).placeholder();
--
To view, visit https://gerrit.wikimedia.org/r/54115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5bdfc05e4cd0535639f85ab40f88012a6f52868f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
