jenkins-bot has submitted this change and it was merged.
Change subject: (bug 44237) replace gM() with mw.msg()
......................................................................
(bug 44237) replace gM() with mw.msg()
replaces deprecated gM()
Change-Id: I29bc0738db4e1e0287268cced7a627b9ba0b22a6
---
M SpecialNewPagesFeed.php
M modules/ext.pageTriage.models/ext.pageTriage.article.js
M modules/ext.pageTriage.models/ext.pageTriage.stats.js
M modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
M modules/ext.pageTriage.views.list/ext.pageTriage.listItem.html
M modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.js
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.js
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.js
M modules/external/datejs-mw.js
17 files changed, 125 insertions(+), 125 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialNewPagesFeed.php b/SpecialNewPagesFeed.php
index 59162fe..fb5fe41 100644
--- a/SpecialNewPagesFeed.php
+++ b/SpecialNewPagesFeed.php
@@ -105,11 +105,11 @@
$triageInterface .= <<<HTML
<!-- top nav template -->
<script type="text/template"
id="listControlNavTemplate">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-showing' ) %></b> <span
id="mwe-pt-filter-status"></span></span>
+ <span
class="mwe-pt-control-label"><b><%= mw.msg( 'pagetriage-showing' ) %></b> <span
id="mwe-pt-filter-status"></span></span>
<span
class="mwe-pt-control-label-right" id="mwe-pt-control-stats"></span><br/>
<span
id="mwe-pt-filter-dropdown-control" class="mwe-pt-control-label">
<b>
- <%= gM(
'pagetriage-filter-list-prompt' ) %>
+ <%= mw.msg(
'pagetriage-filter-list-prompt' ) %>
<span
id="mwe-pt-dropdown-arrow">$dropdownArrow</span>
<!--<span
class="mwe-pt-dropdown-open">▾</span>-->
</b>
@@ -117,19 +117,19 @@
<div
id="mwe-pt-control-dropdown" class="mwe-pt-control-gradient shadow">
<form>
<div
class="mwe-pt-control-section">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-show-heading' )
%></b></span>
+ <span
class="mwe-pt-control-label"><b><%= mw.msg( 'pagetriage-filter-show-heading' )
%></b></span>
<div
class="mwe-pt-control-options">
-
<input type="checkbox" id="mwe-pt-filter-unreviewed-edits" /> <label
for="mwe-pt-filter-unreviewed-edits"><%= gM(
'pagetriage-filter-unreviewed-edits' ) %></label> <br/>
-
<input type="checkbox" id="mwe-pt-filter-reviewed-edits" /> <label
for="mwe-pt-filter-reviewed-edits"><%= gM( 'pagetriage-filter-reviewed-edits' )
%></label> <br/>
-
<input type="checkbox" id="mwe-pt-filter-nominated-for-deletion" /> <label
for="mwe-pt-filter-nominated-for-deletion"><%= gM(
'pagetriage-filter-nominated-for-deletion' ) %></label> <br/>
-
<input type="checkbox" id="mwe-pt-filter-redirects" /> <label
for="mwe-pt-filter-redirects"><%= gM( 'pagetriage-filter-redirects' )
%></label> <br/>
+
<input type="checkbox" id="mwe-pt-filter-unreviewed-edits" /> <label
for="mwe-pt-filter-unreviewed-edits"><%= mw.msg(
'pagetriage-filter-unreviewed-edits' ) %></label> <br/>
+
<input type="checkbox" id="mwe-pt-filter-reviewed-edits" /> <label
for="mwe-pt-filter-reviewed-edits"><%= mw.msg(
'pagetriage-filter-reviewed-edits' ) %></label> <br/>
+
<input type="checkbox" id="mwe-pt-filter-nominated-for-deletion" /> <label
for="mwe-pt-filter-nominated-for-deletion"><%= mw.msg(
'pagetriage-filter-nominated-for-deletion' ) %></label> <br/>
+
<input type="checkbox" id="mwe-pt-filter-redirects" /> <label
for="mwe-pt-filter-redirects"><%= mw.msg( 'pagetriage-filter-redirects' )
%></label> <br/>
</div>
</div>
<div
class="mwe-pt-control-section">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-namespace-heading' )
%></b></span>
+ <span
class="mwe-pt-control-label"><b><%= mw.msg(
'pagetriage-filter-namespace-heading' ) %></b></span>
<div
class="mwe-pt-control-options">
<select id="mwe-pt-filter-namespace">
-
<!--<option value=""><%= gM( 'pagetriage-filter-ns-all' ) %></option>-->
+
<!--<option value=""><%= mw.msg( 'pagetriage-filter-ns-all' )
%></option>-->
<%
var wgFormattedNamespaces = mw.config.get(
'wgFormattedNamespaces' );
var wgPageTriageNamespaces = mw.config.get(
'wgPageTriageNamespaces' );
@@ -140,7 +140,7 @@
continue;
}
if ( wgFormattedNamespaces[namespaceNumber] === '' ) {
-
nsOptions += String('<option value="' +
String(namespaceNumber) + '">' + gM( 'pagetriage-filter-article' ) +
'</option>');
+
nsOptions += String('<option value="' +
String(namespaceNumber) + '">' + mw.msg( 'pagetriage-filter-article' ) +
'</option>');
} else {
nsOptions += String('<option value="' +
String(namespaceNumber) + '">' + wgFormattedNamespaces[namespaceNumber] +
'</option>');
}
@@ -152,23 +152,23 @@
</div>
<!--
abusefilter tags come later.
<div
class="mwe-pt-control-section">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-tag-heading' )
%></b></span>
+ <span
class="mwe-pt-control-label"><b><%= mw.msg( 'pagetriage-filter-tag-heading' )
%></b></span>
<div
class="mwe-pt-control-options">
<input type=text id="mwe-pt-filter-tag" />
</div>
</div>
-->
<div
class="mwe-pt-control-section">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-second-show-heading'
) %></b></span>
+ <span
class="mwe-pt-control-label"><b><%= mw.msg(
'pagetriage-filter-second-show-heading' ) %></b></span>
<div
class="mwe-pt-control-options">
-
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-no-categories"
/> <label for="mwe-pt-filter-no-categories"><%= gM(
'pagetriage-filter-no-categories' ) %></label> <br/>
-
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-orphan" />
<label for="mwe-pt-filter-orphan"><%= gM( 'pagetriage-filter-orphan' )
%></label> <br/>
-
<input type="radio" name="mwe-pt-filter-radio"
id="mwe-pt-filter-non-autoconfirmed" /> <label
for="mwe-pt-filter-non-autoconfirmed"><%= gM(
'pagetriage-filter-non-autoconfirmed' ) %></label> <br/>
-
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-blocked" />
<label for="mwe-pt-filter-blocked"><%= gM( 'pagetriage-filter-blocked' )
%></label> <br/>
-
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-bot-edits" />
<label for="mwe-pt-filter-bot-edits"><%= gM( 'pagetriage-filter-bot-edits' )
%></label> <br/>
-
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-user-selected"
/> <label for="mwe-pt-filter-user-selected"><%= gM(
'pagetriage-filter-user-heading' ) %></label>
-
<input type="text" id="mwe-pt-filter-user" placeholder="<%= gM(
'pagetriage-filter-username' ) %>" /> <br/>
-
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-all" /> <label
for="mwe-pt-filter-all"><%= gM( 'pagetriage-filter-all' ) %></label>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-no-categories"
/> <label for="mwe-pt-filter-no-categories"><%= mw.msg(
'pagetriage-filter-no-categories' ) %></label> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-orphan" />
<label for="mwe-pt-filter-orphan"><%= mw.msg( 'pagetriage-filter-orphan' )
%></label> <br/>
+
<input type="radio" name="mwe-pt-filter-radio"
id="mwe-pt-filter-non-autoconfirmed" /> <label
for="mwe-pt-filter-non-autoconfirmed"><%= mw.msg(
'pagetriage-filter-non-autoconfirmed' ) %></label> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-blocked" />
<label for="mwe-pt-filter-blocked"><%= mw.msg( 'pagetriage-filter-blocked' )
%></label> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-bot-edits" />
<label for="mwe-pt-filter-bot-edits"><%= mw.msg( 'pagetriage-filter-bot-edits'
) %></label> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-user-selected"
/> <label for="mwe-pt-filter-user-selected"><%= mw.msg(
'pagetriage-filter-user-heading' ) %></label>
+
<input type="text" id="mwe-pt-filter-user" placeholder="<%= mw.msg(
'pagetriage-filter-username' ) %>" /> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-all" /> <label
for="mwe-pt-filter-all"><%= mw.msg( 'pagetriage-filter-all' ) %></label>
</div>
</div>
<div
class="mwe-pt-control-buttons">
@@ -177,22 +177,22 @@
</form>
</div>
</span>
- <span
class="mwe-pt-control-label-right"><b><%= gM( 'pagetriage-sort-by' ) %></b>
+ <span
class="mwe-pt-control-label-right"><b><%= mw.msg( 'pagetriage-sort-by' ) %></b>
<span id="mwe-pt-sort-buttons">
- <input type="radio"
id="mwe-pt-sort-newest" name="sort" /><label for="mwe-pt-sort-newest"><%= gM(
'pagetriage-newest' ) %></label>
- <input type="radio"
id="mwe-pt-sort-oldest" name="sort" /><label for="mwe-pt-sort-oldest"><%= gM(
'pagetriage-oldest' ) %></label>
+ <input type="radio"
id="mwe-pt-sort-newest" name="sort" /><label for="mwe-pt-sort-newest"><%=
mw.msg( 'pagetriage-newest' ) %></label>
+ <input type="radio"
id="mwe-pt-sort-oldest" name="sort" /><label for="mwe-pt-sort-oldest"><%=
mw.msg( 'pagetriage-oldest' ) %></label>
</span>
</span>
</script>
<!-- bottom nav template -->
<script type="text/template"
id="listStatsNavTemplate">
- <div
id="mwe-pt-refresh-button-holder"><button id="mwe-pt-refresh-button"><%= gM(
'pagetriage-refresh-list' ) %></button></div>
+ <div
id="mwe-pt-refresh-button-holder"><button id="mwe-pt-refresh-button"><%=
mw.msg( 'pagetriage-refresh-list' ) %></button></div>
<div id="mwe-pt-unreviewed-stats">
- <% if ( ptrUnreviewedCount ) { %><%=
gM( 'pagetriage-unreviewed-article-count', ptrUnreviewedCount, ptrOldest ) %><%
} %>
+ <% if ( ptrUnreviewedCount ) { %><%=
mw.msg( 'pagetriage-unreviewed-article-count', ptrUnreviewedCount, ptrOldest )
%><% } %>
</div>
<div id="mwe-pt-reviewed-stats">
- <% if ( ptrReviewedCount ) { %><%= gM(
'pagetriage-reviewed-article-count-past-week', ptrReviewedCount ) %><% } %>
+ <% if ( ptrReviewedCount ) { %><%=
mw.msg( 'pagetriage-reviewed-article-count-past-week', ptrReviewedCount ) %><%
} %>
</div>
</script>
diff --git a/modules/ext.pageTriage.models/ext.pageTriage.article.js
b/modules/ext.pageTriage.models/ext.pageTriage.article.js
index 93ca91f..2e1597d 100644
--- a/modules/ext.pageTriage.models/ext.pageTriage.article.js
+++ b/modules/ext.pageTriage.models/ext.pageTriage.article.js
@@ -26,12 +26,12 @@
formatMetadata: function ( article ) {
var creation_date_parsed = Date.parseExact(
article.get( 'creation_date' ), 'yyyyMMddHHmmss' );
- article.set('creation_date_pretty',
creation_date_parsed.toString( gM( 'pagetriage-creation-dateformat' ) ) );
+ article.set('creation_date_pretty',
creation_date_parsed.toString( mw.msg( 'pagetriage-creation-dateformat' ) ) );
// sometimes user info isn't set, so check that first.
if( article.get( 'user_creation_date' ) ) {
var user_creation_date_parsed =
Date.parseExact( article.get( 'user_creation_date' ), 'yyyyMMddHHmmss' );
- article.set( 'user_creation_date_pretty',
user_creation_date_parsed.toString( gM( 'pagetriage-info-timestamp-date-format'
) ) );
+ article.set( 'user_creation_date_pretty',
user_creation_date_parsed.toString( mw.msg(
'pagetriage-info-timestamp-date-format' ) ) );
} else {
article.set( 'user_creation_date_pretty', '');
}
@@ -83,7 +83,7 @@
'page_status',
mw.msg(
'pagetriage-page-status-reviewed',
- Date.parseExact(
article.get( 'ptrp_reviewed_updated' ), 'yyyyMMddHHmmss' ).toString( gM(
'pagetriage-info-timestamp-date-format' ) ),
+ Date.parseExact(
article.get( 'ptrp_reviewed_updated' ), 'yyyyMMddHHmmss' ).toString( mw.msg(
'pagetriage-info-timestamp-date-format' ) ),
reviewerInfo.userPageLink,
reviewerInfo.userTalkPageLink,
mw.msg(
'pipe-separator' ),
@@ -174,7 +174,7 @@
if ( diff < 1 ) {
diff = 1;
}
- return gM( 'pagetriage-tag-warning-notice',
diff );
+ return mw.msg( 'pagetriage-tag-warning-notice',
diff );
} else {
return '';
}
diff --git a/modules/ext.pageTriage.models/ext.pageTriage.stats.js
b/modules/ext.pageTriage.models/ext.pageTriage.stats.js
index 40c883b..652ec34 100644
--- a/modules/ext.pageTriage.models/ext.pageTriage.stats.js
+++ b/modules/ext.pageTriage.models/ext.pageTriage.stats.js
@@ -43,9 +43,9 @@
var diff = Math.round( ( now.getTime() -
begin.getTime() ) / ( 1000 * 60 * 60 * 24 ) );
if ( diff ) {
- return gM( 'days', diff );
+ return mw.msg( 'days', diff );
} else {
- return gM( 'pagetriage-stats-less-than-a-day',
diff );
+ return mw.msg(
'pagetriage-stats-less-than-a-day', diff );
}
},
diff --git a/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
b/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
index f845c81..bd41363 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
@@ -5,7 +5,7 @@
tagName: "div",
template: _.template( $( "#listControlNavTemplate" ).html() ),
filterMenuVisible: 0,
- filterStatus: gM( 'pagetriage-filter-stat-all'),
+ filterStatus: mw.msg( 'pagetriage-filter-stat-all'),
newFilterStatus: [],
initialize: function( options ) {
@@ -34,7 +34,7 @@
this.eventBus.bind( "renderStats", function( stats ) {
// fill in the counter when the stats view gets
loaded.
- $( "#mwe-pt-control-stats" ).html( gM(
'pagetriage-stats-filter-page-count', stats.get( 'ptrFilterCount' ) ) );
+ $( "#mwe-pt-control-stats" ).html( mw.msg(
'pagetriage-stats-filter-page-count', stats.get( 'ptrFilterCount' ) ) );
} );
},
@@ -304,7 +304,7 @@
var ns = this.model.getParam( 'namespace' );
var nsText;
if( Number(ns) === 0 ) {
- nsText = gM( 'blanknamespace' );
+ nsText = mw.msg( 'blanknamespace' );
} else {
nsText = mw.config.get(
'wgFormattedNamespaces' )[ns];
}
@@ -318,7 +318,7 @@
var username = this.model.getParam( 'username' );
if( username ) {
- this.newFilterStatus.push( gM(
'pagetriage-filter-stat-username', username ) );
+ this.newFilterStatus.push( mw.msg(
'pagetriage-filter-stat-username', username ) );
$( '#mwe-pt-filter-user-selected' ).prop(
'checked', true );
}
$( '#mwe-pt-filter-user' ).val( username );
@@ -356,7 +356,7 @@
menuCheckboxUpdate: function( $checkbox, param, message ) {
$checkbox.prop( 'checked', this.model.getParam( param
)=="1"?true:false );
if( this.model.getParam( param ) ) {
- this.newFilterStatus.push( gM( message ) );
+ this.newFilterStatus.push( mw.msg( message ) );
}
}
diff --git a/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.html
b/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.html
index 76998fe..9102857 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.html
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.html
@@ -19,25 +19,25 @@
<a class="mwe-pt-list-triage-button ui-button-blue"
style="display:none;" href="<%= title_url %>" target="_blank" title='<%=
reviewRightHelpText %>'></a>
<span class="mwe-pt-page-title"><a href="<%= title_url
%>" target="_blank"><%= mw.html.escape( title ) %></a></span>
<span class="mwe-pt-histlink">
- (<a href="<%= mw.config.get("wgScriptPath") +
"/index.php?title=" + title_url_format + "&action=history" %>"><%= gM(
"pagetriage-hist" ) %></a>)
+ (<a href="<%= mw.config.get("wgScriptPath") +
"/index.php?title=" + title_url_format + "&action=history" %>"><%= mw.msg(
"pagetriage-hist" ) %></a>)
</span>
<span class="mwe-pt-metadata">
·
- <%= gM( "pagetriage-bytes", page_len ) %>
+ <%= mw.msg( "pagetriage-bytes", page_len ) %>
·
- <%= gM( "pagetriage-edits", rev_count ) %>
+ <%= mw.msg( "pagetriage-edits", rev_count ) %>
<% if( category_count == "0" ) { %>
<% if( is_redirect == "0" ) { %>
- · <span
class="mwe-pt-metadata-warning"><%= gM( "pagetriage-no-categories" ) %></span>
+ · <span
class="mwe-pt-metadata-warning"><%= mw.msg( "pagetriage-no-categories" )
%></span>
<% } %>
<% } else { %>
- · <%= gM( "pagetriage-categories",
category_count ) %>
+ · <%= mw.msg(
"pagetriage-categories", category_count ) %>
<% } %>
<% if( linkcount == "0" && is_redirect == "0" )
{ %>
- · <span
class="mwe-pt-metadata-warning"><%= gM("pagetriage-orphan") %></span>
+ · <span
class="mwe-pt-metadata-warning"><%= mw.msg("pagetriage-orphan") %></span>
<% } %>
<% if( typeof reference !== "undefined" &&
reference == "0" && is_redirect == "0" ) { %>
- · <span
class="mwe-pt-metadata-warning"><%= gM( "pagetriage-no-reference" ) %></span>
+ · <span
class="mwe-pt-metadata-warning"><%= mw.msg( "pagetriage-no-reference" )
%></span>
<% } %>
</span>
</div>
@@ -47,20 +47,20 @@
<!-- user_id is undefined or '0' for IP users -->
<% if( typeof ( user_id ) != 'undefined' && Number(
user_id ) !== 0 ) { %>
·
- <%= gM( 'pagetriage-editcount', user_editcount,
user_creation_date_pretty ) %>
+ <%= mw.msg( 'pagetriage-editcount',
user_editcount, user_creation_date_pretty ) %>
<% if( user_bot == "1" ) { %>
·
- <%= gM( 'pagetriage-author-bot' ) %>
+ <%= mw.msg( 'pagetriage-author-bot' ) %>
<% } %>
<% } %>
<% if( user_block_status == "1" ) { %>
·
<span class="mwe-pt-metadata-warning">
- <%= gM( 'pagetriage-author-blocked' ) %>
+ <%= mw.msg( 'pagetriage-author-blocked' ) %>
</span>
<% } %>
<% } else { %>
- <%= gM('pagetriage-no-author') %>
+ <%= mw.msg('pagetriage-no-author') %>
<% } %>
</div>
<div class="mwe-pt-snippet">
diff --git a/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
b/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
index 5dbdcc0..7969af7 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
@@ -17,7 +17,7 @@
if ( mw.config.get( 'wgPageTriageEnableReviewButton' )
) {
data.reviewRightHelpText = '';
} else {
- data.reviewRightHelpText = gM(
'pagetriage-no-patrol-right' );
+ data.reviewRightHelpText = mw.msg(
'pagetriage-no-patrol-right' );
}
// insert the template into the document. fill with the
current model.
this.$el.html( this.template( data ) );
diff --git
a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
index fa4f5f4..9a57fd4 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
@@ -3,11 +3,11 @@
<!-- status icon -->
<div class="mwe-pt-info-status-icon">
<% if ( afd_status == "1" || blp_prod_status == "1" ||
csd_status == "1" || prod_status == "1" ) { %>
- <img src="<%= mw.config.get( 'wgExtensionAssetsPath' )
+
'/PageTriage/modules/ext.pageTriage.views.list/images/icon_marked_for_deletion.png'
%>" width="21" height="21" title="<%= gM( "pagetriage-note-deletion" ) %>" />
+ <img src="<%= mw.config.get( 'wgExtensionAssetsPath' )
+
'/PageTriage/modules/ext.pageTriage.views.list/images/icon_marked_for_deletion.png'
%>" width="21" height="21" title="<%= mw.msg( "pagetriage-note-deletion" ) %>"
/>
<% } else if ( patrol_status != "0" ) { %>
- <img src="<%= mw.config.get( 'wgExtensionAssetsPath' )
+ '/PageTriage/modules/ext.pageTriage.views.list/images/icon_reviewed.png' %>"
width="21" height="21" title="<%= gM( "pagetriage-note-reviewed" ) %>" />
+ <img src="<%= mw.config.get( 'wgExtensionAssetsPath' )
+ '/PageTriage/modules/ext.pageTriage.views.list/images/icon_reviewed.png' %>"
width="21" height="21" title="<%= mw.msg( "pagetriage-note-reviewed" ) %>" />
<% } else { %>
- <img src="<%= mw.config.get( 'wgExtensionAssetsPath' )
+ '/PageTriage/modules/ext.pageTriage.views.list/images/icon_not_reviewed.png'
%>" width="21" height="21" title="<%= gM( "pagetriage-note-not-reviewed" ) %>"
/>
+ <img src="<%= mw.config.get( 'wgExtensionAssetsPath' )
+ '/PageTriage/modules/ext.pageTriage.views.list/images/icon_not_reviewed.png'
%>" width="21" height="21" title="<%= mw.msg( "pagetriage-note-not-reviewed" )
%>" />
<% } %>
</div>
<!-- page status -->
@@ -21,11 +21,11 @@
<div>
<!-- if user is registered (user_id is 0 for IP
users) -->
<% if( typeof user_id != 'undefined' && Number(
user_id ) !== 0 ) { %>
- <%= gM( 'pagetriage-editcount',
user_editcount, user_creation_date_pretty ) %>
+ <%= mw.msg( 'pagetriage-editcount',
user_editcount, user_creation_date_pretty ) %>
<% } %>
</div>
<% } else { %>
- <%= gM('pagetriage-no-author') %>
+ <%= mw.msg('pagetriage-no-author') %>
<% } %>
</span>
<div class="mew-pt-info-stat">
@@ -36,23 +36,23 @@
<!-- possible problems section -->
<div class="mwe-pt-info-header">
- <%= gM( 'pagetriage-info-problem-header' ) %>
+ <%= mw.msg( 'pagetriage-info-problem-header' ) %>
</div>
<div class="mwe-pt-info-content">
<% if ( problems ) { %>
<%= problems %>
<% } else { %>
- <%= gM( 'pagetriage-info-no-problems' ) %>
+ <%= mw.msg( 'pagetriage-info-no-problems' ) %>
<% } %>
</div>
<br/>
<!-- history section -->
<div class="mwe-pt-info-header">
- <%= gM( 'pagetriage-info-history-header' ) %>
+ <%= mw.msg( 'pagetriage-info-history-header' ) %>
<span class="mwe-pt-info-header-details">
- <%= gM( 'pagetriage-edits', rev_count ) %> ·
- <a href="<%= history_link %>"><%= gM(
'pagetriage-info-history-show-full' ) %></a>
+ <%= mw.msg( 'pagetriage-edits', rev_count ) %> ·
+ <a href="<%= history_link %>"><%= mw.msg(
'pagetriage-info-history-show-full' ) %></a>
</span>
</div>
<div class="mwe-pt-info-content" id="mwe-pt-info-history-container"></div>
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
index 2a1e225..41e5554 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
@@ -4,7 +4,7 @@
mw.pageTriage.ArticleInfoView = mw.pageTriage.ToolView.extend( {
id: 'mwe-pt-info',
icon: 'icon_info.png', // the default icon
- title: gM( 'pagetriage-info-title' ),
+ title: mw.msg( 'pagetriage-info-title' ),
tooltip: 'pagetriage-info-tooltip',
template: mw.pageTriage.viewUtil.template( { 'view': 'toolbar',
'template': 'articleInfo.html' } ),
@@ -39,7 +39,7 @@
// put it all together in the byline
var articleByline = mw.msg(
bylineMessage,
- Date.parseExact( this.model.get(
'creation_date' ), 'yyyyMMddHHmmss' ).toString( gM(
'pagetriage-info-timestamp-date-format' ) ),
+ Date.parseExact( this.model.get(
'creation_date' ), 'yyyyMMddHHmmss' ).toString( mw.msg(
'pagetriage-info-timestamp-date-format' ) ),
info.userPageLink,
info.userTalkPageLink,
mw.msg( 'pipe-separator' ),
@@ -49,11 +49,11 @@
}
var stats = [
- gM( "pagetriage-bytes", this.model.get(
'page_len' ) ),
- gM( "pagetriage-edits", this.model.get(
'rev_count' ) ),
- gM( "pagetriage-categories", this.model.get(
'category_count' ) )
+ mw.msg( "pagetriage-bytes", this.model.get(
'page_len' ) ),
+ mw.msg( "pagetriage-edits", this.model.get(
'rev_count' ) ),
+ mw.msg( "pagetriage-categories",
this.model.get( 'category_count' ) )
];
- this.model.set( 'articleStat', gM(
'pagetriage-articleinfo-stat', stats.join( gM( 'pagetriage-dot-separator' ) ) )
);
+ this.model.set( 'articleStat', mw.msg(
'pagetriage-articleinfo-stat', stats.join( mw.msg( 'pagetriage-dot-separator' )
) ) );
this.$tel.html( this.template( this.model.toJSON() ) );
var history = new mw.pageTriage.ArticleInfoHistoryView(
{ eventBus: this.eventBus, model: this.model.revisions } );
@@ -71,9 +71,9 @@
formatProblem: function( problem ) {
return '<li class="mwe-pt-info-problem"><span
class="mwe-pt-info-problem-name">' +
- gM( 'pagetriage-info-problem-' + problem ) +
+ mw.msg( 'pagetriage-info-problem-' + problem ) +
'</span> - <span
class="mwe-pt-info-problem-desc">' +
- gM('pagetriage-info-problem-' + problem +
'-desc') +
+ mw.msg('pagetriage-info-problem-' + problem +
'-desc') +
'</span></li>';
},
@@ -123,8 +123,8 @@
// passed through to nested models, and
switching to backbone-relational in order to
// move these few lines of code seems
silly.
var timestamp_parsed = Date.parseExact(
historyItem.get( 'timestamp' ), 'yyyy-MM-ddTHH:mm:ssZ' );
- historyItem.set('timestamp_date',
timestamp_parsed.toString( gM( 'pagetriage-info-timestamp-date-format' ) ) );
- historyItem.set('timestamp_time',
timestamp_parsed.toString( gM( 'pagetriage-info-timestamp-time-format' ) ) );
+ historyItem.set('timestamp_date',
timestamp_parsed.toString( mw.msg( 'pagetriage-info-timestamp-date-format' ) )
);
+ historyItem.set('timestamp_time',
timestamp_parsed.toString( mw.msg( 'pagetriage-info-timestamp-time-format' ) )
);
if( historyItem.get( 'timestamp_date' )
!== lastDate ) {
historyItem.set( 'new_date',
true );
} else {
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.html
index 2420b70..4cf4324 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.html
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.html
@@ -1,13 +1,13 @@
<div>
<div class="mwe-pt-mark-helptext">
- <%= gM( 'pagetriage-mark-as-' + status + '-helptext' ) %>
+ <%= mw.msg( 'pagetriage-mark-as-' + status + '-helptext' ) %>
</div>
<div id="mwe-pt-review-note">
- <div id="mwe-pt-review-note-title"><%= mw.html.escape( gM(
noteTitle ) ) %></div>
- <div id="mwe-pt-review-note-char-count"><%= mw.html.escape( gM(
'pagetriage-characters-left', maxLength ) ) %></div>
- <textarea id="mwe-pt-review-note-input"><%= mw.html.escape( gM(
'pagetriage-personal-default-note', noteTarget ) ) %></textarea>
+ <div id="mwe-pt-review-note-title"><%= mw.html.escape( mw.msg(
noteTitle ) ) %></div>
+ <div id="mwe-pt-review-note-char-count"><%= mw.html.escape(
mw.msg( 'pagetriage-characters-left', maxLength ) ) %></div>
+ <textarea id="mwe-pt-review-note-input"><%= mw.html.escape(
mw.msg( 'pagetriage-personal-default-note', noteTarget ) ) %></textarea>
</div>
<div id="mwe-pt-mark-as-<%= status %>">
- <button id='mwe-pt-mark-as-<%= status %>-button'
class="ui-button-green"><%= mw.html.escape( gM( "pagetriage-mark-as-" + status
) ) %></button>
+ <button id='mwe-pt-mark-as-<%= status %>-button'
class="ui-button-green"><%= mw.html.escape( mw.msg( "pagetriage-mark-as-" +
status ) ) %></button>
</div>
</div>
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.js
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.js
index e23bd77..0e097ff 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.mark.js
@@ -4,7 +4,7 @@
mw.pageTriage.MarkView = mw.pageTriage.ToolView.extend( {
id: 'mwe-pt-mark',
icon: 'icon_mark_reviewed.png', // the default icon
- title: gM( 'pagetriage-mark-as-reviewed' ),
+ title: mw.msg( 'pagetriage-mark-as-reviewed' ),
tooltip: '',
template: mw.pageTriage.viewUtil.template( { 'view': 'toolbar',
'template': 'mark.html' } ),
noteChanged: false,
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.html
index 705e280..2f1ead1 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.html
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.html
@@ -16,9 +16,9 @@
<div id="mwe-pt-tags-bottom">
<div class="mwe-pt-tool-warning-notice"><%= warningNotice %></div>
<div id="mwe-pt-tag-note">
- <div id="mwe-pt-tag-note-title"><%= mw.html.escape( gM(
'pagetriage-add-a-note-creator' ) ) %></div>
- <div id="mwe-pt-tag-note-char-count"><%= mw.html.escape( gM(
'pagetriage-characters-left', maxLength ) ) %></div>
- <textarea id="mwe-pt-tag-note-input"><%= mw.html.escape( gM(
'pagetriage-personal-default-note', creator ) ) %></textarea>
+ <div id="mwe-pt-tag-note-title"><%= mw.html.escape( mw.msg(
'pagetriage-add-a-note-creator' ) ) %></div>
+ <div id="mwe-pt-tag-note-char-count"><%= mw.html.escape(
mw.msg( 'pagetriage-characters-left', maxLength ) ) %></div>
+ <textarea id="mwe-pt-tag-note-input"><%= mw.html.escape(
mw.msg( 'pagetriage-personal-default-note', creator ) ) %></textarea>
</div>
<div id="mwe-pt-tag-submit">
<a href="#" id="mwe-pt-tag-submit-button"
class="ui-button-green"><%= mw.html.escape( mw.msg(
'pagetriage-button-add-tag-number', 0 ) ) %></a>
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.js
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.js
index 9b7de26..4a0d732 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.js
@@ -3,7 +3,7 @@
mw.pageTriage.TagsView = mw.pageTriage.ToolView.extend( {
id: 'mwe-pt-tag',
icon: 'icon_tag.png',
- title: gM( 'pagetriage-tags-title' ),
+ title: mw.msg( 'pagetriage-tags-title' ),
tooltip: 'pagetriage-tags-tooltip',
template: mw.pageTriage.viewUtil.template( { 'view': 'toolbar',
'template': 'tags.html' } ),
tagsOptions: $.pageTriageTagsOptions,
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.html
index 82a2e8d..af1ab02 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.html
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.html
@@ -3,7 +3,7 @@
<div class="mwe-pt-tool-pokey" style="display: none;"></div>
<div class="mwe-pt-tool-flyout" style="display: none;">
<span class="mwe-pt-tool-title"><%= title %></span>
- <a class="mwe-pt-flyout-help-link" href="#"><%= gM(
'pagetriage-toolbar-learn-more' ) %></a>
+ <a class="mwe-pt-flyout-help-link" href="#"><%= mw.msg(
'pagetriage-toolbar-learn-more' ) %></a>
<span class="mwe-pt-tool-close"><%= mw.msg( 'pagetriage-toolbar-close'
) %></span>
<div class="mwe-pt-tool-content">
<!-- content goes here -->
diff --git
a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.html
index 064e0f2..fbed970 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.html
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.html
@@ -1,10 +1,10 @@
<div id="mwe-pt-toolbar" class="mwe-pt-toolbar-big">
<div id="mwe-pt-toolbar-active">
<div class="mwe-pt-toolbar-minimize">
- <div class="mwe-pt-toolbar-minimize-button" title="<%=
gM( 'pagetriage-toolbar-minimize' ) %>"></div>
+ <div class="mwe-pt-toolbar-minimize-button" title="<%=
mw.msg( 'pagetriage-toolbar-minimize' ) %>"></div>
</div>
<div class="mwe-pt-toolbar-close">
- <div class="mwe-pt-toolbar-close-button" title="<%= gM(
'pagetriage-toolbar-close' ) %>"></div>
+ <div class="mwe-pt-toolbar-close-button" title="<%=
mw.msg( 'pagetriage-toolbar-close' ) %>"></div>
</div>
<div id="mwe-pt-toolbar-main">
<!-- toolbar icons go here -->
@@ -13,10 +13,10 @@
<div id="mwe-pt-toolbar-inactive">
<div class="mwe-pt-toolbar-close">
- <div class="mwe-pt-toolbar-close-button" title="<%= gM(
'pagetriage-toolbar-close' ) %>"></div>
+ <div class="mwe-pt-toolbar-close-button" title="<%=
mw.msg( 'pagetriage-toolbar-close' ) %>"></div>
</div>
<p id="mwe-pt-toolbar-vertical">
- <%= gM( 'pagetriage-toolbar-collapsed' ) %>
+ <%= mw.msg( 'pagetriage-toolbar-collapsed' ) %>
</p>
</div>
</div>
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.html
index c41aff9..c2a54fe 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.html
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.html
@@ -1,7 +1,7 @@
<div>
<div>
- <%= gM( "pagetriage-wikilove-helptext" ) %>
+ <%= mw.msg( "pagetriage-wikilove-helptext" ) %>
</div>
<div id="mwe-pt-article-contributor-list"></div>
- <button id='mwe-pt-wikilove-button' class="ui-button-green
mw-wikilove-launcher"><%= gM( "wikilove-button-send" ) %></button>
+ <button id='mwe-pt-wikilove-button' class="ui-button-green
mw-wikilove-launcher"><%= mw.msg( "wikilove-button-send" ) %></button>
</div>
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.js
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.js
index dd75ccc..463f1c7 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.js
@@ -4,7 +4,7 @@
mw.pageTriage.WikiLoveView = mw.pageTriage.ToolView.extend( {
id: 'mwe-pt-wikilove',
icon: 'icon_wikilove.png', // the default icon
- title: gM( 'wikilove' ),
+ title: mw.msg( 'wikilove' ),
tooltip: 'pagetriage-wikilove-tooltip',
template: mw.pageTriage.viewUtil.template( { 'view': 'toolbar',
'template': 'wikilove.html' } ),
diff --git a/modules/external/datejs-mw.js b/modules/external/datejs-mw.js
index 909c291..e050642 100644
--- a/modules/external/datejs-mw.js
+++ b/modules/external/datejs-mw.js
@@ -6,52 +6,52 @@
// since Mediawiki doesn't currently use those.
Date.CultureInfo.dayNames = [
- gM('sunday'),
- gM('monday'),
- gM('tuesday'),
- gM('wednesday'),
- gM('thursday'),
- gM('friday'),
- gM('saturday')
+ mw.msg('sunday'),
+ mw.msg('monday'),
+ mw.msg('tuesday'),
+ mw.msg('wednesday'),
+ mw.msg('thursday'),
+ mw.msg('friday'),
+ mw.msg('saturday')
];
Date.CultureInfo.abbreviatedDayNames = [
- gM('sun'),
- gM('mon'),
- gM('tue'),
- gM('wed'),
- gM('thu'),
- gM('fri'),
- gM('sat')
+ mw.msg('sun'),
+ mw.msg('mon'),
+ mw.msg('tue'),
+ mw.msg('wed'),
+ mw.msg('thu'),
+ mw.msg('fri'),
+ mw.msg('sat')
];
Date.CultureInfo.monthNames = [
- gM('january'),
- gM('february'),
- gM('march'),
- gM('april'),
- gM('may_long'),
- gM('june'),
- gM('july'),
- gM('august'),
- gM('september'),
- gM('october'),
- gM('november'),
- gM('december')
+ mw.msg('january'),
+ mw.msg('february'),
+ mw.msg('march'),
+ mw.msg('april'),
+ mw.msg('may_long'),
+ mw.msg('june'),
+ mw.msg('july'),
+ mw.msg('august'),
+ mw.msg('september'),
+ mw.msg('october'),
+ mw.msg('november'),
+ mw.msg('december')
];
Date.CultureInfo.abbreviatedMonthNames = [
- gM('jan'),
- gM('feb'),
- gM('mar'),
- gM('apr'),
- gM('may'),
- gM('jun'),
- gM('jul'),
- gM('aug'),
- gM('sep'),
- gM('oct'),
- gM('nov'),
- gM('dec')
+ mw.msg('jan'),
+ mw.msg('feb'),
+ mw.msg('mar'),
+ mw.msg('apr'),
+ mw.msg('may'),
+ mw.msg('jun'),
+ mw.msg('jul'),
+ mw.msg('aug'),
+ mw.msg('sep'),
+ mw.msg('oct'),
+ mw.msg('nov'),
+ mw.msg('dec')
];
} );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/45124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29bc0738db4e1e0287268cced7a627b9ba0b22a6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Nischayn22 <[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
