Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250832
Change subject: Escape message values where possible
......................................................................
Escape message values where possible
We don't need every single message to be an HTML message.
Change-Id: I3773e40072f907aad5fb17f46fa98912b0fea996
---
M modules/ext.pageTriage.models/ext.pageTriage.article.js
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
3 files changed, 19 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/32/250832/1
diff --git a/modules/ext.pageTriage.models/ext.pageTriage.article.js
b/modules/ext.pageTriage.models/ext.pageTriage.article.js
index 2c00548..627bb77 100644
--- a/modules/ext.pageTriage.models/ext.pageTriage.article.js
+++ b/modules/ext.pageTriage.models/ext.pageTriage.article.js
@@ -99,13 +99,13 @@
// delete status
if ( article.get( 'afd_status' ) === '1' ||
article.get( 'blp_prod_status' ) === '1' ||
article.get( 'csd_status' ) === '1' ||
article.get( 'prod_status' ) === '1' ) {
- article.set( 'page_status', mw.msg(
'pagetriage-page-status-delete' ) );
+ article.set( 'page_status', mw.message(
'pagetriage-page-status-delete' ).escaped() );
// unreviewed status
} else if ( article.get( 'patrol_status' ) === '0' ) {
- article.set( 'page_status', mw.msg(
'pagetriage-page-status-unreviewed' ) );
+ article.set( 'page_status', mw.message(
'pagetriage-page-status-unreviewed' ).escaped() );
// auto-reviewed status
} else if ( article.get( 'patrol_status' ) === '3' ) {
- article.set( 'page_status', mw.msg(
'pagetriage-page-status-autoreviewed' ) );
+ article.set( 'page_status', mw.message(
'pagetriage-page-status-autoreviewed' ).escaped() );
// reviewed status
} else {
if ( article.get( 'ptrp_last_reviewed_by' ) !==
0 && article.get( 'reviewer' ) ) {
diff --git
a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
index 9a57fd4..e3aaa4e 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="<%= mw.msg( "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="<%= mw.msg( "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="<%= mw.msg( "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 ) { %>
- <%= mw.msg( 'pagetriage-editcount',
user_editcount, user_creation_date_pretty ) %>
+ <%- mw.msg( 'pagetriage-editcount',
user_editcount, user_creation_date_pretty ) %>
<% } %>
</div>
<% } else { %>
- <%= mw.msg('pagetriage-no-author') %>
+ <%- mw.msg('pagetriage-no-author') %>
<% } %>
</span>
<div class="mew-pt-info-stat">
@@ -35,24 +35,24 @@
<br/>
<!-- possible problems section -->
-<div class="mwe-pt-info-header">
- <%= mw.msg( 'pagetriage-info-problem-header' ) %>
+<div class="mwe-pt-info-header">
+ <%- mw.msg( 'pagetriage-info-problem-header' ) %>
</div>
<div class="mwe-pt-info-content">
<% if ( problems ) { %>
<%= problems %>
<% } else { %>
- <%= mw.msg( 'pagetriage-info-no-problems' ) %>
+ <%- mw.msg( 'pagetriage-info-no-problems' ) %>
<% } %>
</div>
<br/>
<!-- history section -->
<div class="mwe-pt-info-header">
- <%= mw.msg( 'pagetriage-info-history-header' ) %>
+ <%- mw.msg( 'pagetriage-info-history-header' ) %>
<span class="mwe-pt-info-header-details">
- <%= mw.msg( 'pagetriage-edits', rev_count ) %> ·
- <a href="<%= history_link %>"><%= mw.msg(
'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 06bf486..be4a128 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js
@@ -66,9 +66,9 @@
}
stats = [
- 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' ) )
+ mw.message( 'pagetriage-bytes', this.model.get(
'page_len' ) ).escaped(),
+ mw.message( 'pagetriage-edits', this.model.get(
'rev_count' ) ).escaped(),
+ mw.message( 'pagetriage-categories',
this.model.get( 'category_count' ) ).escaped()
];
this.model.set( 'articleStat', mw.msg(
'pagetriage-articleinfo-stat', stats.join( mw.msg( 'pagetriage-dot-separator' )
) ) );
@@ -95,9 +95,9 @@
// pagetriage-info-problem-no-categories-desc,
pagetriage-info-problem-orphan-desc,
// pagetriage-info-problem-no-references-desc
return '<li class="mwe-pt-info-problem"><span
class="mwe-pt-info-problem-name">' +
- mw.msg( 'pagetriage-info-problem-' + problem ) +
+ mw.message( 'pagetriage-info-problem-' +
problem ).escaped() +
'</span> - <span
class="mwe-pt-info-problem-desc">' +
- mw.msg( 'pagetriage-info-problem-' + problem +
'-desc' ) +
+ mw.message( 'pagetriage-info-problem-' +
problem + '-desc' ).escaped() +
'</span></li>';
},
--
To view, visit https://gerrit.wikimedia.org/r/250832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3773e40072f907aad5fb17f46fa98912b0fea996
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
