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

7 years ago · 8e58cebbae
parent 4be80912c8 9b1b2ebb25
commit 8e58cebbae
1 changed files with 2 additions and 1 deletions
--- 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;