UltrasonicNXT has submitted this change and it was merged.
Change subject: Message cleanup
......................................................................
Message cleanup
Replace one with a core MW message, reorder messages in definition
Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6
---
M MediaWikiChat.js
M MediaWikiChat.php
M i18n/en.json
3 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 81c974b..f99bbb2 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -74,7 +74,7 @@
var diff = ( tsNow - timestamp ) / 100;
if ( diff < 30 ) {
- return mw.message( 'chat-just-now' ).text();
+ return mw.message( 'just-now' ).text();
} else if ( diff < 2 * 60 ) {
return mw.message( 'chat-a-minute-ago' ).text();
} else if ( diff < 60 * 60 ) {
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index e312dd2..d577baf 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -32,18 +32,13 @@
$wgResourceModules['ext.mediawikichat.js'] = array(
'scripts' => 'MediaWikiChat.js',
'messages' => array(
- 'january', 'february', 'march', 'april', 'may', 'june',
- 'july', 'august', 'september', 'october', 'november',
'december',
- 'monday', 'tuesday', 'wednesday', 'thursday', 'friday',
'saturday',
- 'sunday', 'chat-type-your-private-message',
'chat-no-other-users',
- 'chat-blocked-from-chat', 'chat-just-now', 'chat-a-minute-ago',
- 'chat-quarter-of-an-hour-ago', 'chat-half-an-hour-ago',
- 'chat-an-hour-ago', 'minutes-ago', 'chat-youve-been-kicked',
- 'chat-you-kicked', 'chat-kicked', 'chat-kick',
- 'chat-youve-been-blocked', 'chat-you-blocked', 'chat-blocked',
- 'chat-block', 'chat-private-message', 'chat-user-is-moderator',
- 'chat-you-are-moderator', 'chat-joined', 'chat-left',
- 'chat-mod-image', 'chat-yesterday', 'chat-flood',
'chat-too-long',
+ 'january', 'february', 'march', 'april', 'may', 'june', 'july',
'august', 'september', 'october',
+ 'november', 'december', 'monday', 'tuesday', 'wednesday',
'thursday', 'friday', 'saturday',
+ 'sunday', 'chat-type-your-private-message',
'chat-no-other-users', 'chat-blocked-from-chat',
+ 'just-now', 'chat-a-minute-ago', 'minutes-ago',
'chat-youve-been-kicked','chat-you-kicked',
+ 'chat-kicked', 'chat-kick', 'chat-youve-been-blocked',
'chat-you-blocked', 'chat-blocked',
+ 'chat-block', 'chat-private-message', 'chat-user-is-moderator',
'chat-you-are-moderator',
+ 'chat-joined', 'chat-left', 'chat-mod-image', 'chat-yesterday',
'chat-flood', 'chat-too-long',
'chat-idle-minutes', 'chat-idle-hours', 'chat-idle-more'
),
'dependencies' => 'mediawiki.jqueryMsg',
diff --git a/i18n/en.json b/i18n/en.json
index 7ae0756..ebcfdd5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,7 +15,6 @@
"chat-sounds": "Play sounds",
"chat-flood": "You can't send messages that fast, please wait before
sending more.",
"chat-too-long": "That message was too long, please send a shorter
message.",
- "chat-just-now": "just now",
"chat-a-minute-ago": "a minute ago",
"chat-yesterday": "yesterday",
"chat-kick": "kick",
--
To view, visit https://gerrit.wikimedia.org/r/141361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <adamr_car...@btinternet.com>
Gerrit-Reviewer: UltrasonicNXT <adamr_car...@btinternet.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
