https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114748

Revision: 114748
Author:   raindrift
Date:     2012-04-05 19:09:41 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
changed 'triaged' to 'reviewed'.  like, for real.

Modified Paths:
--------------
    trunk/extensions/PageTriage/PageTriage.hooks.php
    trunk/extensions/PageTriage/PageTriage.i18n.php
    trunk/extensions/PageTriage/PageTriage.php
    trunk/extensions/PageTriage/SpecialPageTriage.php
    trunk/extensions/PageTriage/api/ApiPageTriageAction.php
    trunk/extensions/PageTriage/api/ApiPageTriageList.php
    trunk/extensions/PageTriage/api/ApiPageTriageStats.php
    trunk/extensions/PageTriage/includes/ArticleMetadata.php
    trunk/extensions/PageTriage/includes/PageTriage.php
    trunk/extensions/PageTriage/includes/PageTriageUtil.php
    
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
    
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.stats.js
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
    trunk/extensions/PageTriage/sql/PageTriageLog.sql
    trunk/extensions/PageTriage/sql/PageTriagePage.sql
    trunk/extensions/PageTriage/sql/PageTriagePageTags.sql
    trunk/extensions/PageTriage/sql/PageTriageTags.sql

Added Paths:
-----------
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_not_reviewed.png
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_reviewed.png
    trunk/extensions/PageTriage/sql/PageTriageRename.sql

Removed Paths:
-------------
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_not_triaged.png
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_triaged.png

Modified: trunk/extensions/PageTriage/PageTriage.hooks.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.hooks.php    2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/PageTriage.hooks.php    2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -3,7 +3,7 @@
 class PageTriageHooks {
 
        /**
-        * Mark a page as untriaged after moving the page if the new title is 
in main namespace 
+        * Mark a page as unreviewed after moving the page if the new title is 
in main namespace 
         *
         * @see 
http://www.mediawiki.org/wiki/Manual:Hooks/SpecialMovepageAfterMove
         * @param $movePage: MovePageForm object

Modified: trunk/extensions/PageTriage/PageTriage.i18n.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.i18n.php     2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php     2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -33,11 +33,11 @@
        'pagetriage-special-contributions' => 'Special:Contributions',
        'pagetriage-showing' => 'Showing',
        'pagetriage-filter-list-prompt' => 'Filter List',
-       'pagetriage-article-count' => 'There are currently $1 untriaged 
articles',
+       'pagetriage-article-count' => 'There are currently $1 unreviewed 
articles',
        'pagetriage-viewing' => 'Viewing',
-       'pagetriage-triage' => 'Triage',
+       'pagetriage-triage' => 'Review',
        'pagetriage-filter-show-heading' => 'Show Only:',
-       'pagetriage-filter-triaged-edits' => 'Triaged Articles',
+       'pagetriage-filter-reviewed-edits' => 'Reviewed Articles',
        'pagetriage-filter-nominated-for-deletion' => 'Nominated for Deletion',
        'pagetriage-filter-bot-edits' => 'Articles by Bots',
        'pagetriage-filter-redirects' => 'Redirects',
@@ -50,7 +50,7 @@
        'pagetriage-filter-non-autoconfirmed' => 'Are by new editors',
        'pagetriage-filter-blocked' => 'Are by blocked users',
        'pagetriage-filter-set-button' => 'Set Filters',
-       'pagetriage-stats-untriaged-age' => '<span 
class="mwe-pt-stats-label">Article Ages:</span> Average: $1, Oldest: $2',
+       'pagetriage-stats-unreviewed-age' => '<span 
class="mwe-pt-stats-label">Article Ages:</span> Average: $1, Oldest: $2',
        'pagetriage-stats-less-than-a-day' => 'less than one day',
        'pagetriage-stats-top-triagers' => 'Top {{PLURAL:$1|triager|$1 
triagers}}:',
        'pagetriage-filter-ns-article' => 'Article',
@@ -58,7 +58,7 @@
        'pagetriage-more' => 'More',
        'pagetriage-filter-stat-all' => 'All',
        'pagetriage-filter-stat-namespace' => 'Namespace: $1',
-       'pagetriage-filter-stat-triaged' => 'Triaged',
+       'pagetriage-filter-stat-reviewed' => 'Reviewed',
        'pagetriage-filter-stat-bots' => 'Bots',
        'pagetriage-filter-stat-redirects' => 'Redirects',
        'pagetriage-filter-stat-no-categories' => 'No categories',
@@ -92,10 +92,10 @@
        'pagetriage-special-contributions' => 'The name of 
Special:Contributions on this wiki',
        'pagetriage-showing' => 'The label for which filters are being shown',
        'pagetriage-filter-list-prompt' => 'Prompt to choose filters for the 
list view',
-       'pagetriage-article-count' => 'A description of the number of untriaged 
articles. $1 is the count.',
+       'pagetriage-article-count' => 'A description of the number of 
unreviewed articles. $1 is the count.',
        'pagetriage-viewing' => 'Label for the sort-order buttons 
(oldest/newest)',
        'pagetriage-filter-show-heading' => 'Prompt for the first set of 
checkboxes in the filter menu',
-       'pagetriage-filter-triaged-edits' => 'Checkbox text for triaged 
articles',
+       'pagetriage-filter-reviewed-edits' => 'Checkbox text for reviewed 
articles',
        'pagetriage-filter-nominated-for-deletion' => 'Checkbox text for 
articles nominated for deletion',
        'pagetriage-filter-bot-edits' => 'Checkbox text for articles by bots',
        'pagetriage-filter-redirects' => 'Checkbox text for redirect articles',
@@ -108,15 +108,15 @@
        'pagetriage-filter-non-autoconfirmed' => 'Checkbox text for articles by 
non-Autoconfirmed users',
        'pagetriage-filter-blocked' => 'Checkbox text for articles by blocked 
users',
        'pagetriage-filter-set-button' => 'Button text for the set filter 
button',
-       'pagetriage-stats-untriaged-age' => 'Navigation text displaying triage 
stats, $1 and $2 are the ages of average and oldest articles respectively',
-       'pagetriage-stats-less-than-a-day' => 'show this message if the article 
age is less than one day, part of variable $1 and $2 of 
{{msg-pagetriage|pagetriage-stats-untriaged-age}} ',
+       'pagetriage-stats-unreviewed-age' => 'Navigation text displaying triage 
stats, $1 and $2 are the ages of average and oldest articles respectively',
+       'pagetriage-stats-less-than-a-day' => 'show this message if the article 
age is less than one day, part of variable $1 and $2 of 
{{msg-pagetriage|pagetriage-stats-unreviewed-age}} ',
        'pagetriage-stats-top-triagers' => 'Text that shows top triagers, $1 is 
the total number, $2 shows the detail',
        'pagetriage-filter-ns-article' => 'The name of the main article 
namespace, for the namespace filter select list',
        'pagetriage-filter-ns-all' => 'For the namespace filter select list, 
text indicating that all namespaces will be selected',
        'pagetriage-more' => 'Text for a link that loads more articles into 
list',
        'pagetriage-filter-stat-all' => 'Status display component for all pages 
(no filter)',
        'pagetriage-filter-stat-namespace' => 'Status display component for the 
namespace filter.  $1 is the name of the namespace.',
-       'pagetriage-filter-stat-triaged' => 'Status display component for 
triaged pages',
+       'pagetriage-filter-stat-reviewed' => 'Status display component for 
reviewed pages',
        'pagetriage-filter-stat-bots' => 'Status display component for 
bot-created pages',
        'pagetriage-filter-stat-redirects' => 'Status display component for 
redirects',
        'pagetriage-filter-stat-no-categories' => 'Status display component for 
articles with no categories',

Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php  2012-04-05 18:37:22 UTC (rev 
114747)
+++ trunk/extensions/PageTriage/PageTriage.php  2012-04-05 19:09:41 UTC (rev 
114748)
@@ -228,7 +228,7 @@
                'pagetriage-triage',
                'pagetriage-show-only',
                'pagetriage-filter-show-heading',
-               'pagetriage-filter-triaged-edits',
+               'pagetriage-filter-reviewed-edits',
                'pagetriage-filter-nominated-for-deletion',
                'pagetriage-filter-bot-edits',
                'pagetriage-filter-redirects',
@@ -241,7 +241,7 @@
                'pagetriage-filter-non-autoconfirmed',
                'pagetriage-filter-blocked',
                'pagetriage-filter-set-button',
-               'pagetriage-stats-untriaged-age',
+               'pagetriage-stats-unreviewed-age',
                'pagetriage-stats-less-than-a-day',
                'pagetriage-stats-top-triagers',
                'days',
@@ -249,7 +249,7 @@
                'pagetriage-filter-ns-all',
                'pagetriage-more',
                'pagetriage-filter-stat-namespace',
-               'pagetriage-filter-stat-triaged',
+               'pagetriage-filter-stat-reviewed',
                'pagetriage-filter-stat-bots',
                'pagetriage-filter-stat-redirects',
                'pagetriage-filter-stat-all',

Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php   2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php   2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -61,7 +61,7 @@
                                                <div class="mwe-pt-article-row 
mwe-pt-deleted">
                                                        <div 
class="mwe-pt-status-icon">&#160;</div>
                                        <% } else if ( patrol_status == "1" ) { 
%>
-                                               <div class="mwe-pt-article-row 
mwe-pt-triaged">
+                                               <div class="mwe-pt-article-row 
mwe-pt-reviewed">
                                                        <div 
class="mwe-pt-status-icon">&#160;</div>
                                        <% } else { %>
                                                <div class="mwe-pt-article-row 
mwe-pt-new">
@@ -158,7 +158,7 @@
                                                                <div 
class="mwe-pt-control-section">
                                                                        <span 
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-show-heading' ) 
%></b></span>
                                                                        <div 
class="mwe-pt-control-options">
-                                                                               
<input type="checkbox" id="mwe-pt-filter-triaged-edits" /> <%= gM( 
'pagetriage-filter-triaged-edits' ) %> <br/>
+                                                                               
<input type="checkbox" id="mwe-pt-filter-reviewed-edits" /> <%= gM( 
'pagetriage-filter-reviewed-edits' ) %> <br/>
                                                                                
<input type="checkbox" id="mwe-pt-filter-nominated-for-deletion" /> <%= gM( 
'pagetriage-filter-nominated-for-deletion' ) %> <br/>
                                                                                
<input type="checkbox" id="mwe-pt-filter-bot-edits" /> <%= gM( 
'pagetriage-filter-bot-edits' ) %> <br/>
                                                                                
<input type="checkbox" id="mwe-pt-filter-redirects" /> <%= gM( 
'pagetriage-filter-redirects' ) %> <br/>
@@ -235,7 +235,7 @@
                                                        %>
                                                </div>
                                                <div 
class="mwe-pt-article-age-stats">
-                                                       <% if ( ptrAverage ) { 
%> <%= gM( 'pagetriage-stats-untriaged-age', ptrAverage, ptrOldest ) %> <% } %>
+                                                       <% if ( ptrAverage ) { 
%> <%= gM( 'pagetriage-stats-unreviewed-age', ptrAverage, ptrOldest ) %> <% } %>
                                                </div>
                                        </div>
                                </script>

Modified: trunk/extensions/PageTriage/api/ApiPageTriageAction.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageAction.php     2012-04-05 
18:37:22 UTC (rev 114747)
+++ trunk/extensions/PageTriage/api/ApiPageTriageAction.php     2012-04-05 
19:09:41 UTC (rev 114748)
@@ -14,7 +14,7 @@
                $params = $this->extractRequestParams();
                
                $pageTriage = new PageTriage( $params['pageid'] );
-               $pageTriage->setTriageStatus( $params['triaged'], $wgUser );
+               $pageTriage->setTriageStatus( $params['reviewed'], $wgUser );
 
                $result = array( 'result' => 'success' );
                $this->getResult()->addValue( null, $this->getModuleName(), 
$result );
@@ -34,7 +34,7 @@
                                ApiBase::PARAM_REQUIRED => true,
                                ApiBase::PARAM_TYPE => 'integer'
                        ),
-                       'triaged' => array(
+                       'reviewed' => array(
                                ApiBase::PARAM_REQUIRED => true,
                                ApiBase::PARAM_TYPE => array(
                                        '1',
@@ -61,13 +61,13 @@
 
        public function getParamDescription() {
                return array(
-                       'pageid' => 'The article for which to be marked as 
triaged or untriaged',
-                       'triaged' => 'whether the article is triaged or not',
+                       'pageid' => 'The article for which to be marked as 
reviewed or unreviewed',
+                       'reviewed' => 'whether the article is reviewed or not',
                        'token' => 'edit token'
                );
        }
 
        public function getDescription() {
-               return 'Mark an article as triaged or untriaged';
+               return 'Mark an article as reviewed or unreviewed';
        }
 }

Modified: trunk/extensions/PageTriage/api/ApiPageTriageList.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageList.php       2012-04-05 
18:37:22 UTC (rev 114747)
+++ trunk/extensions/PageTriage/api/ApiPageTriageList.php       2012-04-05 
19:09:41 UTC (rev 114748)
@@ -61,11 +61,11 @@
                $tables   = array( 'pagetriage_page', 'page' );
                $conds    = array( 'ptrp_page_id = page_id' );
 
-               // Show triaged
-               if ( $opts['showtriaged'] ) {
-                       $conds['ptrp_triaged'] = array( 0, 1 );
+               // Show reviewed
+               if ( $opts['showreviewed'] ) {
+                       $conds['ptrp_reviewed'] = array( 0, 1 );
                } else {
-                       $conds['ptrp_triaged'] = 0;
+                       $conds['ptrp_reviewed'] = 0;
                }
                // Show redirect
                if ( $opts['showredirs'] ) {
@@ -142,7 +142,7 @@
                        'showredirs' => array(
                                ApiBase::PARAM_TYPE => 'boolean',
                        ),
-                       'showtriaged'=> array(
+                       'showreviewed'=> array(
                                ApiBase::PARAM_TYPE => 'boolean',       
                        ),
                        'limit' => array(
@@ -181,7 +181,7 @@
                return array(
                        'showbots' => 'Whether to include bot edits or not', // 
default is not to show bot
                        'showredirs' => 'Whether to include redirects or not', 
// default is not to show redirects
-                       'showtriaged' => 'Whether to include triaged or not', 
// default is not to show triaged
+                       'showreviewed' => 'Whether to include reviewed or not', 
// default is not to show reviewed
                        'limit' => 'The maximum number of results to return',
                        'offset' => 'Timestamp to start from',
                        'dir' => 'The direction the list should be sorted in - 
oldestfirst or newestfirst',

Modified: trunk/extensions/PageTriage/api/ApiPageTriageStats.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageStats.php      2012-04-05 
18:37:22 UTC (rev 114747)
+++ trunk/extensions/PageTriage/api/ApiPageTriageStats.php      2012-04-05 
19:09:41 UTC (rev 114748)
@@ -10,7 +10,7 @@
                }
 
                $data = array(
-                               'untriagedarticle' => 
PageTriageUtil::getUntriagedArticleStat(),
+                               'unreviewedarticle' => 
PageTriageUtil::getUnreviewedArticleStat(),
                                'toptriager' => array(
                                        'total' => count( $topTriager ),
                                        'data' => $topTriager

Modified: trunk/extensions/PageTriage/includes/ArticleMetadata.php
===================================================================
--- trunk/extensions/PageTriage/includes/ArticleMetadata.php    2012-04-05 
18:37:22 UTC (rev 114747)
+++ trunk/extensions/PageTriage/includes/ArticleMetadata.php    2012-04-05 
19:09:41 UTC (rev 114748)
@@ -243,7 +243,7 @@
                // Article page length, creation date, number of edit, title, 
article triage status
                $res = $dbr->select(
                                array( 'page', 'revision', 'pagetriage_page' ),
-                               array( 'page_id', 'page_namespace', 
'page_title', 'page_len', 'COUNT(rev_id) AS rev_count', 'MIN(rev_timestamp) AS 
creation_date', 'ptrp_triaged' ),
+                               array( 'page_id', 'page_namespace', 
'page_title', 'page_len', 'COUNT(rev_id) AS rev_count', 'MIN(rev_timestamp) AS 
creation_date', 'ptrp_reviewed' ),
                                array( 'page_id' => $this->mPageId, 'page_id = 
rev_page', 'page_id = ptrp_page_id'),
                                __METHOD__,
                                array ( 'GROUP BY' => 'page_id' )
@@ -254,7 +254,7 @@
                        $metaData[$row->page_id]['creation_date'] = 
$row->creation_date;
                        $metaData[$row->page_id]['rev_count'] = $row->rev_count;
                        $metaData[$row->page_id]['title'] = 
$title->getPrefixedText();
-                       $metaData[$row->page_id]['patrol_status'] = 
$row->ptrp_triaged;
+                       $metaData[$row->page_id]['patrol_status'] = 
$row->ptrp_reviewed;
                }
                // Remove any non-existing page_id from $this->mPageId
                foreach ( $this->mPageId as $key => $pageId ) {

Modified: trunk/extensions/PageTriage/includes/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/includes/PageTriage.php 2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/includes/PageTriage.php 2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -4,7 +4,7 @@
 
        // database property
        protected $mPageId;
-       protected $mTriaged;
+       protected $mReviewed;
        protected $mTimestamp;
 
        // additional property
@@ -39,7 +39,7 @@
                
                $row = array(
                        'ptrp_page_id' => $this->mPageId,
-                       'ptrp_triaged' => '0',
+                       'ptrp_reviewed' => '0',
                        'ptrp_timestamp' => $res->creation_date
                );
 
@@ -50,20 +50,20 @@
        
        /**
         * set the triage status of an article in pagetriage queue
-        * @param $triaged string - '1'/'0'
+        * @param $reviewed string - '1'/'0'
         * @param $user User
         */
-       public function setTriageStatus( $triaged, User $user = null ) {
+       public function setTriageStatus( $reviewed, User $user = null ) {
                $dbw = wfGetDB( DB_MASTER );
                
                $row = array();
-               if ( $triaged === '1' ) {
-                       $row['ptrp_triaged'] = '1';
+               if ( $reviewed === '1' ) {
+                       $row['ptrp_reviewed'] = '1';
                } else {
-                       $row['ptrp_triaged'] = '0';
+                       $row['ptrp_reviewed'] = '0';
                }
 
-               $this->mTriaged = $row['ptrp_triaged'];
+               $this->mReviewed = $row['ptrp_reviewed'];
 
                $dbw->begin();
                $dbw->update( 'pagetriage_page', $row, array( 'ptrp_page_id' => 
$this->mPageId ), __METHOD__ );
@@ -84,7 +84,7 @@
                
                $res = $dbr->selectRow(
                        array( 'pagetriage_page' ),
-                       array( 'ptrp_triaged', 'ptrp_timestamp' ),
+                       array( 'ptrp_reviewed', 'ptrp_timestamp' ),
                        array( 'ptrp_page_id' => $this->mPageId ),
                        __METHOD__
                );
@@ -93,7 +93,7 @@
                        return false;
                }
                
-               $this->mTriaged = $res->ptrp_triaged;
+               $this->mReviewed = $res->ptrp_reviewed;
                $this->mTimestamp = $res->ptrp_timestamp;
                return true;
        }
@@ -129,7 +129,7 @@
                $row = array(
                        'ptrl_page_id' => $this->mPageId,
                        'ptrl_user_id' => $user->getID(),
-                       'ptrl_triaged' => $this->mTriaged,
+                       'ptrl_reviewed' => $this->mReviewed,
                        'ptrl_timestamp' => $dbw->timestamp( wfTimestampNow() )
                );
                

Modified: trunk/extensions/PageTriage/includes/PageTriageUtil.php
===================================================================
--- trunk/extensions/PageTriage/includes/PageTriageUtil.php     2012-04-05 
18:37:22 UTC (rev 114747)
+++ trunk/extensions/PageTriage/includes/PageTriageUtil.php     2012-04-05 
19:09:41 UTC (rev 114748)
@@ -11,7 +11,7 @@
         * @param $article Article object
         * 
         * @return Mixed null if the page is not in the triage system,
-        * otherwise whether or not the page is untriaged.
+        * otherwise whether or not the page is unreviewed.
         * Return convention is this way so that null and false are equivalent
         * with a straight boolean test.
         */
@@ -27,7 +27,7 @@
 
                $dbr = wfGetDB( DB_SLAVE );
 
-               $row = $dbr->selectRow( 'pagetriage_page', 'ptrp_triaged',
+               $row = $dbr->selectRow( 'pagetriage_page', 'ptrp_reviewed',
                        array( 'ptrp_page_id' => $article->getID() )
                );
 
@@ -35,20 +35,20 @@
                        return null;
                }
 
-               return !(boolean)$row->ptrp_triaged;
+               return !(boolean)$row->ptrp_reviewed;
        }
 
        /**
-        * Get a list of stat for untriaged articles
+        * Get a list of stat for unreviewed articles
         * @return array
         *
         * @Todo - Limit the number of records by a timestamp filter, maybe 30 
days etc,
         *         depends on the time the triage queue should look back for 
listview
         */
-       public static function getUntriagedArticleStat() {
+       public static function getUnreviewedArticleStat() {
                global $wgMemc;
 
-               $key = wfMemcKey( 'pagetriage', 'untriaged-article', 'stat' );
+               $key = wfMemcKey( 'pagetriage', 'unreviewed-article', 'stat' );
        
                $data = $wgMemc->get( $key );
                if ( $data !== false ) {
@@ -60,7 +60,7 @@
                $res = $dbr->selectRow( 
                        array( 'pagetriage_page' ),
                        array( 'COUNT(ptrp_page_id) AS total' ),
-                       array( 'ptrp_triaged' => 0 )
+                       array( 'ptrp_reviewed' => 0 )
                );
 
                $percentile = array( 25, 50, 75, 90, 100 );
@@ -74,7 +74,7 @@
                if ( $res ) {
                        $data['count'] = intval( $res->total );
 
-                       // show percentile stat only if there is a certain 
number of untriaged articles
+                       // show percentile stat only if there is a certain 
number of unreviewed articles
                        if ( $data['count'] > 10 ) {
                                foreach ( $percentile as $val ) {
                                        $data['age-' . $val . 'th-percentile'] 
= self::estimateArticleAgePercentile( $val, $data['count'] );
@@ -133,41 +133,41 @@
        }
        
        /**
-        * Get the number of triaged articles in last week
+        * Get the number of reviewed articles in last week
         * @return int
         */
-       public static function getTriagedArticleNum() {
+       public static function getReviewedArticleNum() {
                global $wgMemc;
 
                $dbr = wfGetDB( DB_SLAVE );
-               $key = wfMemcKey( 'pagetriage', 'triaged-article', 'num' );
+               $key = wfMemcKey( 'pagetriage', 'reviewed-article', 'num' );
 
-               $triagedArticleNum = $wgMemc->get( $key );
+               $reviewedArticleNum = $wgMemc->get( $key );
 
-               if ( $triagedArticleNum !== false) {
-                       return $triagedArticleNum;
+               if ( $reviewedArticleNum !== false) {
+                       return $reviewedArticleNum;
                }
 
                $res = $dbr->selectRow(
                        array( 'pagetriage_page' ),
                        array( 'COUNT(ptrp_page_id) AS num' ),
-                       array( 'ptrp_triaged = 1', 'ptrp_timestamp > ' . 
$dbr->addQuotes( $dbr->timestamp( wfTimestamp( TS_UNIX ) - 7 * 24 * 60 * 60 ) ) 
),
+                       array( 'ptrp_reviewed = 1', 'ptrp_timestamp > ' . 
$dbr->addQuotes( $dbr->timestamp( wfTimestamp( TS_UNIX ) - 7 * 24 * 60 * 60 ) ) 
),
                        __METHOD__
                );
 
                if ( $res ) {
-                       $triagedArticleNum = $res->num;
+                       $reviewedArticleNum = $res->num;
                } else {
-                       $triagedArticleNum = 0; 
+                       $reviewedArticleNum = 0;        
                }
 
-               $wgMemc->set( $key, $triagedArticleNum, 6 * 60 * 60 );
+               $wgMemc->set( $key, $reviewedArticleNum, 6 * 60 * 60 );
 
-               return $triagedArticleNum;
+               return $reviewedArticleNum;
        }
        
        /**
-        * Calculate the age of untriaged articles by percentile
+        * Calculate the age of unreviewed articles by percentile
         * @param $percentile int
         * @param $count int
         * @return int|bool
@@ -201,7 +201,7 @@
                $res = $dbr->selectRow(
                        array( 'pagetriage_page' ),
                        array( 'ptrp_timestamp' ),
-                       array( 'ptrp_triaged' => 0 ),
+                       array( 'ptrp_reviewed' => 0 ),
                        __METHOD__,
                        array( 'ORDER BY' => "ptrp_timestamp $order", 'LIMIT' 
=> '1', 'OFFSET' => $start )
                );

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
 2012-04-05 18:37:22 UTC (rev 114747)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
 2012-04-05 19:09:41 UTC (rev 114748)
@@ -52,7 +52,7 @@
                        /*
                        showbots: null,
                        showredirs: null,
-                       showtriaged: null,
+                       showreviewed: null,
                        no_category: 1,
                        no_inbound_links: 1,
                        non_autoconfirmed_users: 1,

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.stats.js
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.stats.js
   2012-04-05 18:37:22 UTC (rev 114747)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.stats.js
   2012-04-05 19:09:41 UTC (rev 114748)
@@ -14,7 +14,7 @@
                },
 
                formatMetadata: function ( stats ) {
-                       stats.set( 'ptr_untriaged_article_count', stats.get( 
'untriagedarticle' )['count'] );
+                       stats.set( 'ptr_unreviewed_article_count', stats.get( 
'unreviewedarticle' )['count'] );
 
                        var topTriager = {};
                        for ( var i in stats.get( 'toptriager' )['data'] ) {
@@ -28,8 +28,8 @@
 
                        stats.set( 'ptrTopTriager',  topTriager );
                        stats.set( 'ptrTopTriagerStr', gM( 
'pagetriage-stats-top-triagers', Number( stats.get( 'toptriager' ).total ) ) );
-                       stats.set( 'ptrAverage', this.formatDaysFromNow( 
stats.get( 'untriagedarticle' )['age-50th-percentile'] ) );
-                       stats.set( 'ptrOldest', this.formatDaysFromNow( 
stats.get( 'untriagedarticle' )['age-100th-percentile'] ) );
+                       stats.set( 'ptrAverage', this.formatDaysFromNow( 
stats.get( 'unreviewedarticle' )['age-50th-percentile'] ) );
+                       stats.set( 'ptrOldest', this.formatDaysFromNow( 
stats.get( 'unreviewedarticle' )['age-100th-percentile'] ) );
                },
 
                formatDaysFromNow: function ( dateStr ) {

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
   2012-04-05 18:37:22 UTC (rev 114747)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
   2012-04-05 19:09:41 UTC (rev 114748)
@@ -35,7 +35,7 @@
 
                        this.eventBus.bind( "renderStats", function( stats ) {
                                // fill in the counter when the stats view gets 
loaded.
-                               $( "#mwe-pt-control-stats" ).html( gM( 
'pagetriage-article-count', stats.get('ptr_untriaged_article_count') ) );
+                               $( "#mwe-pt-control-stats" ).html( gM( 
'pagetriage-article-count', stats.get('ptr_unreviewed_article_count') ) );
                        } );
 
                        // update the filter display on load.
@@ -126,8 +126,8 @@
                        }
 
                        // these are conditionals because the keys shouldn't 
exist if the checkbox isn't checked.
-                       if( $('#mwe-pt-filter-triaged-edits').prop('checked') ) 
{
-                               apiParams['showtriaged'] = '1';
+                       if( $('#mwe-pt-filter-reviewed-edits').prop('checked') 
) {
+                               apiParams['showreviewed'] = '1';
                        }
                        
                        /*
@@ -199,7 +199,7 @@
                                this.newFilterStatus.push( gM( 
'pagetriage-filter-stat-namespace', nsText ) );  
                        }
                        
-                       this.menuCheckboxUpdate( $( 
'#mwe-pt-filter-triaged-edits' ), 'showtriaged', 
'pagetriage-filter-stat-triaged');
+                       this.menuCheckboxUpdate( $( 
'#mwe-pt-filter-reviewed-edits' ), 'showreviewed', 
'pagetriage-filter-stat-reviewed');
                        // api doesn't suppor this one.
                        //this.menuCheckboxUpdate( $( 
'#mwe-pt-filter-nominated-for-deletion' ' ), '', '');
                        this.menuCheckboxUpdate( $( '#mwe-pt-filter-bot-edits' 
), 'showbots', 'pagetriage-filter-stat-bots');

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
        2012-04-05 18:37:22 UTC (rev 114747)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
        2012-04-05 19:09:41 UTC (rev 114748)
@@ -29,7 +29,7 @@
 .mwe-pt-article-row.mwe-pt-new {
        background-color: #f2b3b3;
 }
-.mwe-pt-article-row.mwe-pt-triaged {
+.mwe-pt-article-row.mwe-pt-reviewed {
        background-color: #c3ead7;
 }
 .mwe-pt-article-row.mwe-pt-deleted {
@@ -43,12 +43,12 @@
 }
 .mwe-pt-new .mwe-pt-status-icon {
        /* @embed */
-       background-image: url('images/icon_not_triaged.png');
+       background-image: url('images/icon_not_reviewed.png');
        background-repeat: no-repeat;
 }
-.mwe-pt-triaged .mwe-pt-status-icon {
+.mwe-pt-reviewed .mwe-pt-status-icon {
        /* @embed */
-       background-image: url('images/icon_triaged.png');
+       background-image: url('images/icon_reviewed.png');
        background-repeat: no-repeat;
 }
 

Copied: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_not_reviewed.png
 (from rev 114747, 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_not_triaged.png)
===================================================================
(Binary files differ)

Deleted: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_not_triaged.png
===================================================================
(Binary files differ)

Copied: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_reviewed.png
 (from rev 114747, 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_triaged.png)
===================================================================
(Binary files differ)

Deleted: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/icon_triaged.png
===================================================================
(Binary files differ)

Modified: trunk/extensions/PageTriage/sql/PageTriageLog.sql
===================================================================
--- trunk/extensions/PageTriage/sql/PageTriageLog.sql   2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/sql/PageTriageLog.sql   2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -3,7 +3,7 @@
        ptrl_id int unsigned NOT NULL PRIMARY KEY auto_increment,
        ptrl_page_id int unsigned NOT NULL,
        ptrl_user_id int unsigned NOT NULL,
-       ptrl_triaged tinyint unsigned not null default 0,
+       ptrl_reviewed tinyint unsigned not null default 0,
        ptrl_comment varbinary(255),
        ptrl_timestamp varbinary(14) NOT NULL
 ) /*$wgDBTableOptions*/;

Modified: trunk/extensions/PageTriage/sql/PageTriagePage.sql
===================================================================
--- trunk/extensions/PageTriage/sql/PageTriagePage.sql  2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/sql/PageTriagePage.sql  2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -1,9 +1,9 @@
--- Store the list of articles to be triaged or being triaged already
+-- Store the list of articles to be reviewed or being reviewed already
 CREATE TABLE /*_*/pagetriage_page (
        ptrp_page_id int unsigned NOT NULL PRIMARY KEY,
-       ptrp_triaged tinyint unsigned not null default 0,
+       ptrp_reviewed tinyint unsigned not null default 0,
        ptrp_timestamp varbinary(14) NOT NULL COMMENT 'when the page was 
created'
 ) /*$wgDBTableOptions*/;
 
-CREATE INDEX /*i*/ptrp_triaged_timestamp_page_id ON /*_*/pagetriage_page 
(ptrp_triaged, ptrp_timestamp, ptrp_page_id);
+CREATE INDEX /*i*/ptrp_reviewed_timestamp_page_id ON /*_*/pagetriage_page 
(ptrp_reviewed, ptrp_timestamp, ptrp_page_id);
 CREATE INDEX /*i*/ptrp_timestamp_page_id ON /*_*/pagetriage_page 
(ptrp_timestamp, ptrp_page_id);

Modified: trunk/extensions/PageTriage/sql/PageTriagePageTags.sql
===================================================================
--- trunk/extensions/PageTriage/sql/PageTriagePageTags.sql      2012-04-05 
18:37:22 UTC (rev 114747)
+++ trunk/extensions/PageTriage/sql/PageTriagePageTags.sql      2012-04-05 
19:09:41 UTC (rev 114748)
@@ -1,4 +1,4 @@
--- Store the metadata for article to be triaged
+-- Store the metadata for article to be reviewed
 CREATE TABLE /*_*/pagetriage_page_tags (
        ptrpt_page_id int unsigned NOT NULL,
        ptrpt_tag_id int unsigned NOT NULL,

Added: trunk/extensions/PageTriage/sql/PageTriageRename.sql
===================================================================
--- trunk/extensions/PageTriage/sql/PageTriageRename.sql                        
        (rev 0)
+++ trunk/extensions/PageTriage/sql/PageTriageRename.sql        2012-04-05 
19:09:41 UTC (rev 114748)
@@ -0,0 +1,2 @@
+alter table /*_*/pagetriage_log change ptrl_triaged ptrl_reviewed tinyint 
unsigned not null;
+alter table /*_*/pagetriage_page change ptrp_triaged ptrp_reviewed tinyint 
unsigned not null;


Property changes on: trunk/extensions/PageTriage/sql/PageTriageRename.sql
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/extensions/PageTriage/sql/PageTriageTags.sql
===================================================================
--- trunk/extensions/PageTriage/sql/PageTriageTags.sql  2012-04-05 18:37:22 UTC 
(rev 114747)
+++ trunk/extensions/PageTriage/sql/PageTriageTags.sql  2012-04-05 19:09:41 UTC 
(rev 114748)
@@ -16,7 +16,7 @@
 ('prod_status', 'PROD status'),
 ('blp_prod_status', 'BLP PROD status'),
 ('afd_status', 'AFD status'),
-('patrol_status', 'Already review/triaged'),
+('patrol_status', 'Already reviewed'),
 ('rev_count', 'Number of edits to the article'),
 ('page_len', 'Number of bytes of article'),
 ('creation_date', 'Article creation date'),


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to