From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 resources/mediawiki.language/mediawiki.language.js | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'resources/mediawiki.language/mediawiki.language.js')

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.
-- 
cgit v1.2.2