WMDE-leszek has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303788
Change subject: [DNM] Use moment.js's localized date and time format
......................................................................
[DNM] Use moment.js's localized date and time format
Localized format of date containing month name, day, year and time
is used instead of format enforcing the order of time and date,
and use of short month name.
Note: this should be only merged if there is consensus this is
a right approach. See: T141167
Bug: T141167
Change-Id: I39b2844e777beb986cefb3097d52d481bb038a63
---
M modules/ext.RevisionSlider.Revision.js
M tests/qunit/RevisionSlider.Revision.test.js
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/88/303788/1
diff --git a/modules/ext.RevisionSlider.Revision.js
b/modules/ext.RevisionSlider.Revision.js
index 4fa6f68..59b747d 100644
--- a/modules/ext.RevisionSlider.Revision.js
+++ b/modules/ext.RevisionSlider.Revision.js
@@ -123,7 +123,7 @@
// Moment's offset works "backwards", as the number of
minutes
// behind UTC, so we need to make this number negative
var offset = -mw.libs.revisionSlider.userOffset;
- return moment( rawDate ).zone( offset ).format( 'HH:mm,
D MMM YYYY' );
+ return moment( rawDate ).zone( offset ).format( 'LLL' );
},
/**
diff --git a/tests/qunit/RevisionSlider.Revision.test.js
b/tests/qunit/RevisionSlider.Revision.test.js
index f940274..6fec514 100644
--- a/tests/qunit/RevisionSlider.Revision.test.js
+++ b/tests/qunit/RevisionSlider.Revision.test.js
@@ -24,7 +24,7 @@
assert.equal( rev.isMinor(), false );
if ( mw.config.get( 'wgUserLanguage' ) === 'en' ) {
- assert.equal( rev.getFormattedDate(), '10:27, 26 Apr
2016' );
+ assert.equal( rev.getFormattedDate(), '26 April 2016
10:27 AM' );
}
} );
@@ -58,7 +58,7 @@
mw.libs.revisionSlider.userOffset = 0;
- assert.equal( rev.getFormattedDate(), '10:27, 26 Apr 2016' );
+ assert.equal( rev.getFormattedDate(), '26 April 2016 10:27 AM'
);
}, mw.config.get( 'wgUserLanguage' ) !== 'en' );
QUnit.revisionSlider.testOrSkip( 'getFormattedDate, offset: 120 (treat
as hours, +2h)', function ( assert ) {
@@ -69,7 +69,7 @@
// Berlin = 120
mw.libs.revisionSlider.userOffset = 120;
- assert.equal( rev.getFormattedDate(), '12:27, 26 Apr 2016' );
+ assert.equal( rev.getFormattedDate(), '26 April 2016 12:27 PM'
);
}, mw.config.get( 'wgUserLanguage' ) !== 'en' );
QUnit.revisionSlider.testOrSkip( 'getFormattedDate, negative offset:
-420 (treat as hours, -7h)', function ( assert ) {
@@ -80,7 +80,7 @@
// San Francisco = -420
mw.libs.revisionSlider.userOffset = -420;
- assert.equal( rev.getFormattedDate(), '03:27, 26 Apr 2016' );
+ assert.equal( rev.getFormattedDate(), '26 April 2016 3:27 AM' );
}, mw.config.get( 'wgUserLanguage' ) !== 'en' );
QUnit.test( 'hasEmptyComment comment with whitespaces', function (
assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/303788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39b2844e777beb986cefb3097d52d481bb038a63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
