From: Liangent <liangent@gmail.com>
Date: Tue, 24 Oct 2017 21:29:57 +0000 (+0000)
Subject: mw.widgets.DateInputWidget: Fix unexpected MMMMM or ddddd date format
X-Git-Tag: 1.31.0-rc.0~1661^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=9b1b2ebb25d51ee070ad4978f4e58028079705b5;p=lhc%2Fweb%2Fwiklou.git

mw.widgets.DateInputWidget: Fix unexpected MMMMM or ddddd date format

In some locale data in moment.js such as zh, llll date format already
uses MMMM and dddd. The original attempt to expand MMM to MMMM and ddd
to dddd inadvertently expands MMMM to MMMMM and dddd to ddddd, which is
then interpreted as MMMM or dddd followed by an unexpected single M or d.

Change-Id: I2634dfbaaf9615a13dce7b8f4ba3c3bea6863a91
---

diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index f10c93db48..9d2e93b8cf 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -465,7 +465,8 @@
 			format = llll.replace( lll.replace( ll, '' ), '' );
 
 			if ( this.longDisplayFormat ) {
-				format = format.replace( 'MMM', 'MMMM' ).replace( 'ddd', 'dddd' );
+				// Replace MMM to MMMM and ddd to dddd but don't change MMMM and dddd
+				format = format.replace( /MMMM?/, 'MMMM' ).replace( /dddd?/, 'dddd' );
 			}
 
 			return format;