Polybuildr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232779
Change subject: [WIP] Update i18n messages
......................................................................
[WIP] Update i18n messages
- qqq.json incomplete
Change-Id: I883319e836f892a068ff938f4d9bcb218a894982
---
M SmiteSpam.php
M SpecialSmiteSpam.php
M SpecialSmiteSpamTrustedUsers.php
M i18n/en.json
M static/js/ext.smitespam.js
5 files changed, 83 insertions(+), 71 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmiteSpam
refs/changes/79/232779/1
diff --git a/SmiteSpam.php b/SmiteSpam.php
index 5d60b6f..e44685d 100644
--- a/SmiteSpam.php
+++ b/SmiteSpam.php
@@ -39,20 +39,23 @@
'mediawiki.jqueryMsg',
),
'messages' => array(
- 'smitespam-page',
- 'smitespam-probability',
+ 'smitespam-block',
+ 'smitespam-blocked',
+ 'smitespam-block-failed',
'smitespam-created-by',
- 'smitespam-preview-text',
'smitespam-delete',
- 'table_pager_prev',
- 'table_pager_next',
- 'smitespam-loading',
- 'smitespam-delete-page-success-msg',
'smitespam-delete-page-failure-msg',
- 'smitespam-deleted-reason',
- 'powersearch-toggleall',
- 'powersearch-togglenone',
- 'smitespam-select',
+ 'smitespam-loading',
+ 'smitespam-trust',
+ 'smitespam-trusted',
+ 'table_pager_next',
+ 'table_pager_prev',
+ 'smitespam-blocked-user-failure-msg',
+ 'smitespam-blocked-user-success-msg',
+ 'smitespam-delete-page-failure-msg',
+ 'smitespam-delete-page-success-msg',
+ 'smitespam-trusted-user-failure-msg',
+ 'smitespam-trusted-user-success-msg',
),
);
diff --git a/SpecialSmiteSpam.php b/SpecialSmiteSpam.php
index 6a0319d..d74ff4a 100644
--- a/SpecialSmiteSpam.php
+++ b/SpecialSmiteSpam.php
@@ -44,7 +44,9 @@
}
$out->addHTML(
- '<a target="_blank"
href="./Special:SmiteSpamTrustedUsers">View trusted users</a>'
+ '<a target="_blank"
href="./Special:SmiteSpamTrustedUsers">' .
+ wfMessage( 'smitespam-view-trusted-users' )->text() .
+ '</a>'
);
$out->addHTML( '<h2>' . $this->msg(
'smitespam-spam-pages-list-heading' )->text() . '</h2>' );
diff --git a/SpecialSmiteSpamTrustedUsers.php b/SpecialSmiteSpamTrustedUsers.php
index 7f7d5b7..e158836 100644
--- a/SpecialSmiteSpamTrustedUsers.php
+++ b/SpecialSmiteSpamTrustedUsers.php
@@ -28,10 +28,9 @@
);
if ( $result ) {
- // TODO i18n
$out->addHTML(
'<div
class="errorbox">' .
- "<p>User '$username'
already trusted.</p>" .
+ "<p>" . wfMessage(
'smitespam-already-trusted', $username ) . "</p>" .
'</div>'
);
} else {
@@ -45,18 +44,16 @@
'trusted_user_admin_id' => $this->getUser()->getID()
)
);
- // TODO i18n
$out->addHTML(
'<div
class="successbox">' .
- "<p>Trusted user
'$username'.</p>" .
+ "<p>" . wfMessage(
'smitespam-trusted-user-message', $username )->escaped() . "</p>" .
'</div>'
);
}
} else {
- // TODO i18n
$out->addHTML(
'<div class="errorbox">' .
- "<p>User '$username' does not
exist.</p>" .
+ "<p>" . wfMessage(
'smitespam-userdoesnotexist', $username )->escaped() . "</p>" .
'</div>'
);
}
@@ -70,7 +67,6 @@
'smitespam_trusted_user',
array( 'trusted_user_id
= ' . $user->getId() )
);
- // TODO i18n
$out->addHTML(
'<div
class="successbox">' .
"<p>Removed user
'$usernameToDelete' from trusted users.</p>" .
@@ -94,15 +90,16 @@
$out->addHTML( "<form method=\"post\">" );
- $out->addHTML( '<label>Add user: <input type="text"
name="username"></label>' .
- ' <input type="submit" value="Add" name="add">' );
+ $out->addHTML( '<label>' . wfMessage(
'smitespam-add-user-label' )->text() .
+ '<input type="text" name="username"></label>' .
+ ' <input type="submit" value="' . wfMessage(
'smitespam-add-user-button' )->text() .
+ '" name="add">' );
- // TODO i18n
$out->addHTML( '<table class="wikitable"><tr>' .
- '<th>Trusted User</th>' .
- '<th>Timestamp</th>' .
- '<th>Trusting Admin</th>' .
- '<th>Remove</th>' .
+ '<th>' . wfMessage( 'smitespam-trusted-user' )->text()
. '</th>' .
+ '<th>' . wfMessage( 'smitespam-timestamp' )->text() .
'</th>' .
+ '<th>' . wfMessage( 'smitespam-trusting-admin'
)->text() . '</th>' .
+ '<th>' . wfMessage( 'smitespam-remove' )->text() .
'</th>' .
'</tr>'
);
foreach ( $result as $row ) {
@@ -119,11 +116,14 @@
Sanitizer::escapeHtmlAllowEntities( $admin ),
array( 'target' => '_blank' )
);
+
+ // TODO i18n
$out->addHTML(
"<tr><td>$trustedUserContribsLink</td>" .
"<td>$timestamp</td>" .
"<td>$adminContribsLink</td>" .
- "<td><button type=\"submit\" name=\"remove\"
value=\"$trustedUser\">Remove</button></tr>"
+ "<td><button type=\"submit\" name=\"remove\"
value=\"$trustedUser\">" .
+ wfMessage( 'smitespam-remove' )->text() .
"</button></tr>"
);
}
$out->addHTML( '</table>' );
diff --git a/i18n/en.json b/i18n/en.json
index 1bd716a..d214424 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,23 +4,41 @@
"polybuildr"
]
},
- "smitespam": "Smite Spam",
+ "smitespam": "SmiteSpam",
"smitespam-desc": "Provides a [[Special:SmiteSpam|special page]] to
help administrators identify and delete spam wiki pages.",
"smitespam-spam-pages-list-heading": "Possible spam pages",
- "smitespam-delete-page-success-msg": "Deleted page",
- "smitespam-delete-page-failure-msg": "Failed to delete page",
- "smitespam-page": "Page",
"smitespam-delete": "Delete",
- "smitespam-probability": "Probability",
- "smitespam-created-by": "Created by",
- "smitespam-preview-text": "Preview text",
- "smitespam-delete-selected": "Delete selected",
- "smitespam-deleted-reason": "Identified as spam by
Extension:SmiteSpam.",
- "action-smitespam": "smite spam",
+ "smitespam-delete-page-success-msg": "Deleted page \"$1\".",
+ "smitespam-delete-page-failure-msg": "Failed to delete page \"$1\".",
+ "smitespam-created-by": "Created by $1",
+ "smitespam-deleted-reason": "Identified as spam by the SmiteSpam
extension.",
+ "action-smitespam": "use the SmiteSpam extension",
"smitespam-probability-low": "Low",
"smitespam-probability-medium": "Medium",
"smitespam-probability-high": "High",
"smitespam-probability-very-high": "Very high",
"smitespam-select": "Select: ",
- "smitespamtrustedusers": "SmiteSpam Trusted Users"
+ "smitespamtrustedusers": "SmiteSpam Trusted Users",
+ "smitespam-already-trusted": "User '$1' already trusted.",
+ "smitespam-trusted-user-message": "Trusted user '$1'.",
+ "smitespam-userdoesnotexist": "User '$1' does not exist.",
+ "smitespam-add-user-label": "Add user:",
+ "smitespam-add-user-button": "Add",
+ "smitespam-trust": "Trust",
+ "smitespam-trusted": "Trusted",
+ "smitespam-trust-failed": "Failed to trust",
+ "smitespam-trusted-user": "Trusted user",
+ "smitespam-timestamp": "Timestamp",
+ "smitespam-trusting-admin": "Trusting admin",
+ "smitespam-remove": "Remove",
+ "smitespam-block-reason": "Spamming",
+ "smitespam-block": "Block",
+ "smitespam-blocked": "Blocked",
+ "smitespam-block-failed": "Failed to block",
+ "smitespam-blocked-user-success-msg": "Blocked user \"$1\".",
+ "smitespam-blocked-user-failure-msg": "Failed to block user \"$1\".",
+ "smitespam-loading": "Loading...",
+ "smitespam-trusted-user-success-msg": "Trusted user \"$1\".",
+ "smitespam-trusted-user-failure-msg": "Failed to trust user \"$1\".",
+ "smitespam-view-trusted-users": "View trusted users"
}
diff --git a/static/js/ext.smitespam.js b/static/js/ext.smitespam.js
index 8751c34..ef57c79 100644
--- a/static/js/ext.smitespam.js
+++ b/static/js/ext.smitespam.js
@@ -86,16 +86,14 @@
}
refreshRangeDisplayer();
createSuccessbox();
- // TODO i18n
- $( '#ajax-successbox' ).append( '<p>Page "' +
pageTitleText + '" deleted.</p>' );
+ $( '#ajax-successbox' ).append( '<p>' + mw.msg(
'smitespam-delete-page-success-msg', pageTitleText ) + '</p>' );
} else if ( 'error' in data ) {
pagesFailedToDelete.push( pageID );
if ( row.length ) {
row.find( 'td' ).eq( 3 ).text( mw.msg(
'smitespam-delete-page-failure-msg' ) );
}
createErrorbox();
- // TODO i18n
- $( '#ajax-errorbox' ).append( '<p>Failed to
delete page "' + pageTitleText + '".</p>' );
+ $( '#ajax-errorbox' ).append( '<p>' + mw.msg(
'smitespam-delete-page-failure-msg', pageTitleText ) + '".</p>' );
}
pagesToDeleteIndex++;
if ( pagesToDeleteIndex < pagesToDelete.length ) {
@@ -117,8 +115,7 @@
nocreate: '',
noemail: '',
autoblock: '',
- // TODO i18n
- reason: 'Spamming'
+ reason: mw.msg(
'smitespam-block-reason' )
},
'json'
).done( ajaxQueries.blockUser.processResponse );
@@ -131,29 +128,25 @@
var $this = $( this );
if ( $this.parent().data( 'username' )
=== username ) {
$this.empty();
- // TODO i18n
- $this.append( ' ·
(Blocked)' );
+ $this.append( ' · (' +
mw.msg( 'smitespam-blocked' ) + ')');
$this.parent().find(
'.trust-user-button-container' ).remove();
return false;
}
} );
createSuccessbox();
- // TODO i18n
- $( '#ajax-successbox' ).append( '<p>User "' +
username + '" blocked.</p>' );
+ $( '#ajax-successbox' ).append( '<p>' + mw.msg(
'smitespam-blocked-user-success-msg', username ) + '</p>' );
} else if ( 'error' in data ) {
usersFailedToBlock.push( username );
$( '#smitespam-page-list .creator-card
.block-checkbox-container' ).each( function () {
var $this = $( this );
if ( $this.parent().data( 'username' )
=== username ) {
$this.empty();
- // TODO i18n
- $this.append( ' ·
(Failed to block)' );
+ $this.append( ' · (' +
mw.msg( 'smitespam-block-failed' ) + ')' );
return false;
}
} );
createErrorbox();
- // TODO i18n
- $( '#ajax-errorbox' ).append( '<p>Failed to
block user "' + username + '".</p>' );
+ $( '#ajax-errorbox' ).append( '<p>' + mw.msg(
'smitespam-blocked-user-failure-msg', username ) + '</p>' );
}
usersToBlockIndex++;
if ( usersToBlockIndex < usersToBlock.length ) {
@@ -249,18 +242,16 @@
function ( data ) {
if ( 'smitespamtrustuser' in data ) {
$this.parent().parent().find(
'.block-checkbox-container' ).remove();
- // TODO i18n
- $this.parent().append(
'Trusted' );
+ $this.parent().append( mw.msg(
'smitespam-trusted' ) );
$this.remove();
createSuccessbox();
-
- $( '#ajax-successbox' ).append(
'<p>Trusted user "' + username + '".</p>' );
+ $( '#ajax-successbox' ).append(
'<p>' + mw.msg( 'smitespam-trusted-user-success-msg', username ) + '</p>' );
} else {
- // TODO i18n
$this.parent().append( 'Failed
to trust' );
$this.remove();
createErrorbox();
- $( '#ajax-errorbox' ).append(
'<p>Failed to trust user "' + username + '".</p>' );
+ // TODO i18n
+ $( '#ajax-errorbox' ).append(
'<p>' + mw.msg( 'smitespam-trusted-user-failure-msg', username ) + '</p>' );
}
}
);
@@ -274,16 +265,17 @@
$userGroup.append( '<hr>' );
var $creatorCard = $( '<div>' )
.addClass( 'creator-card' )
- .html( mw.msg( 'smitespam-created-by' ) + ' ' +
- ( users[groupCreator] ?
users[groupCreator].link : groupCreator ) )
+ .html( mw.msg(
+ 'smitespam-created-by',
+ users[groupCreator] ?
users[groupCreator].link : groupCreator
+ )
+ )
.data( 'username', groupCreator );
if ( users[groupCreator] ) {
if ( users[groupCreator].blocked ) {
- // TODO i18n
- $creatorCard.append( ' ·
(Blocked)' );
+ $creatorCard.append( ' · (' +
mw.msg( 'smitespam-blocked' ) + ')' );
} else if ( $.inArray( groupCreator,
usersFailedToBlock ) !== -1 ) {
- // TODO i18n
- $creatorCard.append( ' · (Failed
to block)' );
+ $creatorCard.append( ' · (' +
mw.msg( 'smitespam-block-failed' ) + ')' );
} else {
var $blockCheckboxContainer = $(
'<span>' ).addClass( 'block-checkbox-container' );
var $blockCheckbox = $( '<input>', {
@@ -296,14 +288,12 @@
}
$blockCheckboxContainer.append( '
· ' );
$blockCheckboxContainer.append(
$blockCheckbox );
- // TODO i18n
- $blockCheckboxContainer.append( 'Block'
);
+ $blockCheckboxContainer.append( mw.msg(
'smitespam-block' ) );
$creatorCard.append(
$blockCheckboxContainer );
var $trustUserButtonContainer = $(
'<span>' ).addClass( 'trust-user-button-container' );
$trustUserButtonContainer.append( '
· ' );
- // TODO i18n
- var $trustUserButton = $( '<button>'
).text( 'Trust' )
+ var $trustUserButton = $( '<button>'
).text( mw.msg( 'smitespam-trust' ) )
.on( 'click',
onTrustUserButtonClick );
$trustUserButtonContainer.append(
$trustUserButton );
@@ -342,7 +332,7 @@
$checkbox.attr( 'checked',
'checked' );
}
$( '<label>' ).append( $checkbox )
- .append( 'Delete' ) // TODO:
i18n
+ .append( mw.msg(
'smitespam-delete' ) )
.appendTo( $cardInfoSection );
}
$userGroup.append( $card );
@@ -433,8 +423,7 @@
$( '<span>', { id: 'smitespam-displayed-range-to' } ).appendTo(
$rangeDisplayer );
$pagination.append( $rangeDisplayer );
- // TODO i18n
- $( '<span>', { id: 'smitespam-loading' } ).text( ' (Loading
more pages...)' ).appendTo( $pagination );
+ $( '<span>', { id: 'smitespam-loading' } ).text( ' (' + mw.msg(
'smitespam-loading' ) + ')' ).appendTo( $pagination );
var $pager = $( '<p>' ).addClass( 'pager' );
$( '<span>', { id: 'smitespam-pager-prev-container' }
).appendTo( $pager );
--
To view, visit https://gerrit.wikimedia.org/r/232779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I883319e836f892a068ff938f4d9bcb218a894982
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmiteSpam
Gerrit-Branch: master
Gerrit-Owner: Polybuildr <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
