From 0047c07b39b6a92f6aaa161eba1dca126f81843d Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Mon, 16 Jan 2012 10:05:48 +0000 Subject: [PATCH] reintroduce the shortcut evaluation removed in r108403 and r108405 --- languages/classes/LanguageLt.php | 4 ++++ resources/mediawiki.language/languages/lt.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/languages/classes/LanguageLt.php b/languages/classes/LanguageLt.php index 9b4634266e..af38b6ae97 100644 --- a/languages/classes/LanguageLt.php +++ b/languages/classes/LanguageLt.php @@ -20,6 +20,10 @@ class LanguageLt extends Language { */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } + + // if the number is not mentioned in message, then use $form[0] for singular and $form[1] for plural or zero + if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1]; + $forms = $this->preConvertPlural( $forms, 3 ); // Form[0] if n mod 10 is 1 and n mod 100 not in 11..19; if ( $count % 10 == 1 && $count % 100 != 11 ) return $forms[0]; diff --git a/resources/mediawiki.language/languages/lt.js b/resources/mediawiki.language/languages/lt.js index 025754f29a..04964afff6 100644 --- a/resources/mediawiki.language/languages/lt.js +++ b/resources/mediawiki.language/languages/lt.js @@ -3,6 +3,10 @@ */ mediaWiki.language.convertPlural = function( count, forms ) { + // if the number is not mentioned in message, then use $form[0] for singular and $form[1] for plural or zero + if ( forms.length == 2 ) { + return count == 1 ? forms[0] : forms[1]; + } forms = mediaWiki.language.preConvertPlural( forms, 3 ); if ( count % 10 == 1 && count % 100 != 11 ) { return forms[0]; -- 2.20.1