Plural rules: updates for UTS #35 Rev 33

[lhc/web/wiklou.git] / includes / cache / LocalisationCache.php

diff --git a/includes/cache/LocalisationCache.php b/includes/cache/LocalisationCache.php
index f02e0a1..e18c64b 100644 (file)
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -609,6 +609,10 @@ class LocalisationCache {
                        $ruleElements = $ruleset->getElementsByTagName( "pluralRule" );
                        foreach ( $ruleElements as $elt ) {
                                $ruleType = $elt->getAttribute( 'count' );
+                               if ( $ruleType === 'other' ) {
+                                       // Don't record "other" rules, which have an empty condition
+                                       continue;
+                               }
                                $rules[] = $elt->nodeValue;
                                $ruleTypes[] = $ruleType;
                        }
@@ -1197,7 +1201,7 @@ class LCStoreCDB implements LCStore {
                        if ( file_exists( $fileName ) ) {
                                try {
                                        $this->readers[$code] = CdbReader::open( $fileName );
-                               } catch( CdbException $e ) {
+                               } catch ( CdbException $e ) {
                                        wfDebug( __METHOD__ . ": unable to open cdb file for reading" );
                                }
                        }