UltrasonicNXT has submitted this change and it was merged.
Change subject: Add case for idle times over 24 hours
......................................................................
Add case for idle times over 24 hours
Change-Id: I768bf05270ffa7b7103b087ac8600dceb649bf6a
---
M MediaWikiChat.i18n.php
M MediaWikiChat.js
M MediaWikiChat.php
3 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.i18n.php b/MediaWikiChat.i18n.php
index 4390cdb..ea11ed2 100644
--- a/MediaWikiChat.i18n.php
+++ b/MediaWikiChat.i18n.php
@@ -85,6 +85,7 @@
'chat-idle-minutes' => 'This user has been idle for {{PLURAL:$1|a
minute|$1 minutes}}',
'chat-idle-hours' => 'This user has been idle for {{PLURAL:$1|an
hour|$1 hours}}',
+ 'chat-idle-more' => 'This user has been idle for over 24 hours',
);
/** Message documentation (Message documentation)
@@ -241,6 +242,7 @@
{{Identical|Chat}}',
'chat-idle-minutes' => 'Tooltip for users who have been away for over
10 minutes. The number of minutes is $1. {{Related|Chat-idle-hours}}',
'chat-idle-hours' => 'Tooltip for users who have been away for over 1
hour. The number of hours is $1. {{Related|Chat-idle-minutes}}',
+ 'chat-idle-more' => 'Tooltip for users who have been away for over 24
hours.'
);
/** Arabic (العربية)
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 8675052..16c2074 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -354,14 +354,18 @@
var tooltip = '';
if ( hours > 1 ) {
- tooltip = mw.message( 'chat-idle-hours', Math.round(
hours ) );
+ if ( hours > 24 ) {
+ tooltip = mw.message( 'chat-idle-more' ).text();
+ } else {
+ tooltip = mw.message( 'chat-idle-hours',
Math.round( hours ) ).text();
+ }
hours = 1;
} else {
var minutes = microseconds / 6000;
if ( minutes > 10 ) {
- tooltip = mw.message( 'chat-idle-minutes',
Math.round( minutes ) );
+ tooltip = mw.message( 'chat-idle-minutes',
Math.round( minutes ) ).text();
} else {
- tooltip = mw.message( 'chat-private-message' );
+ tooltip = mw.message( 'chat-private-message'
).text();
}
}
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index 6c231da..c380174 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -4,7 +4,7 @@
*
* @file
* @ingroup Extensions
- * @version 1.0
+ * @version 2.10.2
* @author Adam Carter
* @copyright Copyright 2013, Adam Carter
*/
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
- 'version' => '2.10.1',
+ 'version' => '2.10.2',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',
@@ -45,7 +45,7 @@
'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-minutes', 'chat-idle-hours', 'chat-idle-more'
),
'dependencies' => 'mediawiki.jqueryMsg',
'localBasePath' => dirname( __FILE__ ),
--
To view, visit https://gerrit.wikimedia.org/r/120378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I768bf05270ffa7b7103b087ac8600dceb649bf6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <[email protected]>
Gerrit-Reviewer: UltrasonicNXT <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
