Make the javascript implementation of Macedonian(mk) plural consistant with php side...

Add a todo in php code since the rules differs from CLDR definition for mk plural.

diff --git a/languages/classes/LanguageMk.php b/languages/classes/LanguageMk.php
index 4ae7f41..4e3b576 100644 (file)
--- 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 5105025..c89bbac 100644 (file)
--- 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];
 };