r110572 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110571‎ | r110572 | r110573 >
Date:14:42, 2 February 2012
Author:amire80
Status:ok
Tags:core 
Comment:
== comparison for all languages, instead of ===, according to Niklas' suggestion. Follow up to r110485, r110492, r110461.
Modified paths:
  • /trunk/phase3/languages/classes/LanguageGd.php (modified) (history)
  • /trunk/phase3/languages/classes/LanguageHe.php (modified) (history)
  • /trunk/phase3/languages/classes/LanguageMo.php (modified) (history)
  • /trunk/phase3/languages/classes/LanguageMt.php (modified) (history)
  • /trunk/phase3/languages/classes/LanguageRo.php (modified) (history)
  • /trunk/phase3/languages/classes/LanguageSgs.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/classes/LanguageRo.php
@@ -18,9 +18,9 @@
1919
2020 $forms = $this->preConvertPlural( $forms, 3 );
2121
22 - if ( $count === 1 ) {
 22+ if ( $count == 1 ) {
2323 $index = 0;
24 - } elseif ( $count === 0 || ( $count % 100 > 0 && $count % 100 < 20 ) ) {
 24+ } elseif ( $count == 0 || ( $count % 100 > 0 && $count % 100 < 20 ) ) {
2525 $index = 1;
2626 } else {
2727 $index = 2;
Index: trunk/phase3/languages/classes/LanguageGd.php
@@ -29,13 +29,13 @@
3030 $forms = $this->preConvertPlural( $forms, 6 );
3131
3232 $count = abs( $count );
33 - if ( $count === 1 ) {
 33+ if ( $count == 1 ) {
3434 return $forms[0];
35 - } elseif ( $count === 2 ) {
 35+ } elseif ( $count == 2 ) {
3636 return $forms[1];
37 - } elseif ( $count === 11 ) {
 37+ } elseif ( $count == 11 ) {
3838 return $forms[2];
39 - } elseif ( $count === 12 ) {
 39+ } elseif ( $count == 12 ) {
4040 return $forms[3];
4141 } elseif ( ($count >= 3 && $count <= 10) || ($count >= 13 && $count <= 19) ) {
4242 return $forms[4];
Index: trunk/phase3/languages/classes/LanguageHe.php
@@ -59,9 +59,9 @@
6060 if ( !count( $forms ) ) { return ''; }
6161 $forms = $this->preConvertPlural( $forms, 3 );
6262
63 - if ( $count === 1 ) {
 63+ if ( $count == 1 ) {
6464 return $forms[0]; // Singular
65 - } elseif ( $count === 2 ) {
 65+ } elseif ( $count == 2 ) {
6666 return $forms[2]; // Dual or plural if dual is not provided (filled in preConvertPlural)
6767 } else {
6868 return $forms[1]; // Plural
Index: trunk/phase3/languages/classes/LanguageSgs.php
@@ -17,7 +17,7 @@
1818 $forms = $this->preConvertPlural( $forms, 4 );
1919
2020 $count = abs( $count );
21 - if ( $count === 0 || ( $count % 100 === 0 || ( $count % 100 >= 10 && $count % 100 < 20 ) ) ) {
 21+ if ( $count == 0 || ( $count % 100 === 0 || ( $count % 100 >= 10 && $count % 100 < 20 ) ) ) {
2222 return $forms[2];
2323 } elseif ( $count % 10 === 1 ) {
2424 return $forms[0];
Index: trunk/phase3/languages/classes/LanguageMo.php
@@ -19,9 +19,9 @@
2020
2121 $forms = $this->preConvertPlural( $forms, 3 );
2222
23 - if ( $count === 1 ) {
 23+ if ( $count == 1 ) {
2424 $index = 0;
25 - } elseif ( $count === 0 || ( $count % 100 > 0 && $count % 100 < 20 ) ) {
 25+ } elseif ( $count == 0 || ( $count % 100 > 0 && $count % 100 < 20 ) ) {
2626 $index = 1;
2727 } else {
2828 $index = 2;
Index: trunk/phase3/languages/classes/LanguageMt.php
@@ -19,8 +19,8 @@
2020
2121 $forms = $this->preConvertPlural( $forms, 4 );
2222
23 - if ( $count === 1 ) $index = 0;
24 - elseif ( $count === 0 || ( $count % 100 > 1 && $count % 100 < 11 ) ) $index = 1;
 23+ if ( $count == 1 ) $index = 0;
 24+ elseif ( $count == 0 || ( $count % 100 > 1 && $count % 100 < 11 ) ) $index = 1;
2525 elseif ( $count % 100 > 10 && $count % 100 < 20 ) $index = 2;
2626 else $index = 3;
2727 return $forms[$index];

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r110461Adding plural tests for more languages.amire8004:53, 1 February 2012
r110485Fixed plural rules for Romanian / Moldovan according to CLDR. Added tests for...amire8015:37, 1 February 2012
r110492Fixes r110484.amire8015:53, 1 February 2012

Status & tagging log