From 1605b61f8f4c27e30cf9aed49763177b3aeb43f9 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Tue, 10 Jan 2012 04:25:21 +0000 Subject: [PATCH] Make the javascript implementation of Macedonian(mk) plural consistant with php side rule. Add a todo in php code since the rules differs from CLDR definition for mk plural. --- languages/classes/LanguageMk.php | 2 +- resources/mediawiki.language/languages/mk.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/classes/LanguageMk.php b/languages/classes/LanguageMk.php index 4ae7f412a5..4e3b576ff6 100644 --- a/languages/classes/LanguageMk.php +++ b/languages/classes/LanguageMk.php @@ -17,7 +17,7 @@ class LanguageMk extends Language { function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } $forms = $this->preConvertPlural( $forms, 2 ); - + // TODO CLDR defines forms[0] for n != 11 and not for n%100 !== 11 if ( $count % 10 === 1 && $count % 100 !== 11 ) { return $forms[0]; } else { diff --git a/resources/mediawiki.language/languages/mk.js b/resources/mediawiki.language/languages/mk.js index 5105025c03..c89bbac592 100644 --- a/resources/mediawiki.language/languages/mk.js +++ b/resources/mediawiki.language/languages/mk.js @@ -4,5 +4,5 @@ mediaWiki.language.convertPlural = function( count, forms ) { forms = mediaWiki.language.preConvertPlural( forms, 2 ); - return ( count % 10 === 1 ) ? forms[0] : forms[1]; + return ( ( count % 10 === 1 ) && ( count % 100 !== 11 ) ) ? forms[0] : forms[1]; }; -- 2.20.1