2 files changed, 77 insertions, 0 deletions

diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index 7f729bdc..631d13df 100644
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -45,11 +45,34 @@ var language = {
 	 */
 	convertPlural: function ( count, forms ) {
 		var pluralRules,
+			formCount,
+			form,
+			index,
+			equalsPosition,
 			pluralFormIndex = 0;
 
 		if ( !forms || forms.length === 0 ) {
 			return '';
 		}
+
+		// Handle for explicit n= forms
+		for ( index = 0; index < forms.length; index++ ) {
+			form = forms[index];
+			if ( /^\d+=/.test( form ) ) {
+				equalsPosition = form.indexOf( '=' );
+				formCount = parseInt( form.substring( 0, equalsPosition ), 10 );
+				if ( formCount === count ) {
+					return form.substr( equalsPosition + 1 );
+				}
+				forms[index] = undefined;
+			}
+		}
+
+		// Remove explicit plural forms from the forms.
+		forms = $.map( forms, function ( form ) {
+			return form;
+		} );
+
 		pluralRules = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'pluralRules' );
 		if ( !pluralRules ) {
 			// default fallback.
diff --git a/resources/mediawiki.language/mediawiki.language.months.js b/resources/mediawiki.language/mediawiki.language.months.js
new file mode 100644
index 00000000..3d4b7ee7
--- /dev/null
+++ b/resources/mediawiki.language/mediawiki.language.months.js
@@ -0,0 +1,54 @@
+/**
+ * Transfer of month names from messages into mw.language.
+ *
+ * Loading this module also ensures the availability of appropriate messages via mw.msg.
+ */
+( function ( mw, $ ) {
+	var
+		monthMessages = [
+			'january', 'february', 'march', 'april',
+			'may_long', 'june', 'july', 'august',
+			'september', 'october', 'november', 'december'
+		],
+		monthGenMessages = [
+			'january-gen', 'february-gen', 'march-gen', 'april-gen',
+			'may-gen', 'june-gen', 'july-gen', 'august-gen',
+			'september-gen', 'october-gen', 'november-gen', 'december-gen'
+		],
+		monthAbbrevMessages = [
+			'jan', 'feb', 'mar', 'apr',
+			'may', 'jun', 'jul', 'aug',
+			'sep', 'oct', 'nov', 'dec'
+		];
+
+	// Function suitable for passing to jQuery.map
+	// Can't use mw.msg directly because jQuery.map passes element index as second argument
+	function mwMsgMapper( key ) {
+		return mw.msg( key );
+	}
+
+	/**
+	 * Information about month names in current UI language.
+	 *
+	 * Object keys:
+	 * - `names`: array of month names (in nominative case in languages which have the distinction),
+	 *   zero-indexed
+	 * - `genitive`: array of month names in genitive case, zero-indexed
+	 * - `abbrev`: array of three-letter-long abbreviated month names, zero-indexed
+	 * - `keys`: object with three keys like the above, containing zero-indexed arrays of message keys
+	 *   for appropriate messages which can be passed to mw.msg.
+	 *
+	 * @property
+	 */
+	mw.language.months = {
+		keys: {
+			names: monthMessages,
+			genitive: monthGenMessages,
+			abbrev: monthAbbrevMessages
+		},
+		names: $.map( monthMessages, mwMsgMapper ),
+		genitive: $.map( monthGenMessages, mwMsgMapper ),
+		abbrev: $.map( monthAbbrevMessages, mwMsgMapper )
+	};
+
+}( mediaWiki, jQuery ) );