Merge "mediawiki.Uri: Don't ignore options param when using default uri"

[lhc/web/wiklou.git] / resources / src / moment-locale-overrides.js

diff --git a/resources/src/moment-locale-overrides.js b/resources/src/moment-locale-overrides.js
index d49fcdc..8aba831 100644 (file)
--- a/resources/src/moment-locale-overrides.js
+++ b/resources/src/moment-locale-overrides.js
@@ -1,23 +1,8 @@
-// Use DMY date format for Moment.js, in accordance with MediaWiki's date formatting routines.
-// This affects English only (and languages without localisations, that fall back to English).
-// http://momentjs.com/docs/#/customization/long-date-formats/
-/*global moment, mw */
-moment.locale( 'en', {
-       longDateFormat: {
-               // Unchanged, but have to be repeated here:
-               LT: 'h:mm A',
-               LTS: 'h:mm:ss A',
-               // Customized:
-               L: 'DD/MM/YYYY',
-               LL: 'D MMMM YYYY',
-               LLL: 'D MMMM YYYY LT',
-               LLLL: 'dddd, D MMMM YYYY LT'
-       }
-} );
+/* global moment, mw */
 
 // HACK: Overwrite moment's i18n with MediaWiki's for the current language so that
 // wgTranslateNumerals is respected.
-moment.locale( moment.locale(), {
+moment.updateLocale( moment.locale(), {
        preparse: function ( s ) {
                var i,
                        table = mw.language.getDigitTransformTable();
@@ -42,7 +27,7 @@ moment.locale( moment.locale(), {
                if ( mw.config.get( 'wgTranslateNumerals' ) ) {
                        for ( i = 0; i < 10; i++ ) {
                                if ( table[ i ] !== undefined ) {
-                                       s = s.replace( new RegExp( mw.RegExp.escape( i ), 'g' ), table[ i ] );
+                                       s = s.replace( new RegExp( i, 'g' ), table[ i ] );
                                }
                        }
                }