Merge branch 'hotfix/4207' into develop

Forward port zendframework/zendframework#4207
zendframework · Apr 12, 2013 · 041fc63 · 041fc63
commit 041fc63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Translator/TextDomain.php b/src/Translator/TextDomain.php
@@ -47,7 +47,7 @@ public function setPluralRule(PluralRule $rule)
     public function getPluralRule()
     {
         if ($this->pluralRule === null) {
-            $this->setPluralRule(PluralRule::fromString('nplurals=2; plural=n==1'));
+            $this->setPluralRule(PluralRule::fromString('nplurals=2; plural=n != 1;'));
         }
 
         return $this->pluralRule;

diff --git a/test/Translator/TextDomainTest.php b/test/Translator/TextDomainTest.php
@@ -39,9 +39,9 @@ public function testPluralRuleSetter()
     public function testPluralRuleDefault()
     {
         $domain = new TextDomain();
-        $this->assertEquals(0, $domain->getPluralRule()->evaluate(0));
-        $this->assertEquals(1, $domain->getPluralRule()->evaluate(1));
-        $this->assertEquals(0, $domain->getPluralRule()->evaluate(2));
+        $this->assertEquals(1, $domain->getPluralRule()->evaluate(0));
+        $this->assertEquals(0, $domain->getPluralRule()->evaluate(1));
+        $this->assertEquals(1, $domain->getPluralRule()->evaluate(2));
     }
 
     public function testMerging()