X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.language%2Fmediawiki.language.js;h=dceae1178a3044741ffc0b5f325067a3b704e5cc;hb=fd6ec11a54e622b0631d530d8289ee0789e993c9;hp=a0b556914d8406ff8eef0719f74f08115a0c045b;hpb=0ff2c62197fdaf79f82d8657afd70621725c9762;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.language/mediawiki.language.js b/resources/src/mediawiki.language/mediawiki.language.js
index a0b556914d..dceae1178a 100644
--- a/resources/src/mediawiki.language/mediawiki.language.js
+++ b/resources/src/mediawiki.language/mediawiki.language.js
@@ -40,39 +40,18 @@ $.extend( mw.language, {
 	 *
 	 * @param {number} count Non-localized quantifier
 	 * @param {Array} forms List of plural forms
+	 * @param {Object} [explicitPluralForms] List of explicit plural forms
 	 * @return {string} Correct form for quantifier in this language
 	 */
-	convertPlural: function ( count, forms ) {
+	convertPlural: function ( count, forms, explicitPluralForms ) {
 		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;
-			}
+		if ( explicitPluralForms && explicitPluralForms[count] ) {
+			return explicitPluralForms[count];
 		}
 
-		// Remove explicit plural forms from the forms.
-		forms = $.map( forms, function ( form ) {
-			return form;
-		} );
-
-		if ( forms.length === 0 ) {
+		if ( !forms || forms.length === 0 ) {
 			return '';
 		}
 
@@ -144,8 +123,28 @@ $.extend( mw.language, {
 			return grammarForms[form][word] || word;
 		}
 		return word;
-	}
+	},
 
+	/**
+	 * Turn a list of string into a simple list using commas and 'and'.
+	 *
+	 * See Language::listToText in languages/Language.php
+	 *
+	 * @param {string[]} list
+	 * @return {string}
+	 */
+	listToText: function ( list ) {
+		var text = '', i = 0;
+		for ( ; i < list.length; i++ ) {
+			text += list[i];
+			if ( list.length - 2 === i ) {
+				text += mw.msg( 'and' ) + mw.msg( 'word-separator' );
+			} else if ( list.length - 1 !== i ) {
+				text += mw.msg( 'comma-separator' );
+			}
+		}
+		return text;
+	}
 } );
 
 }( mediaWiki, jQuery ) );