Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · 8870381 · 8870381
6 parents a82fc82 + 7c2a059 + 7ea3aed + df6a706 + 4fefb53 + 599ee3a
commit 8870381
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -333,7 +333,7 @@ public function translatePlural(
                 );
             }
 
-            return ($number != 1 ? $singular : $plural);
+            return ($number == 1 ? $singular : $plural);
         }
 
         $index = $this->messages[$textDomain][$locale]

diff --git a/test/Filter/NumberFormatTest.php b/test/Filter/NumberFormatTest.php
@@ -64,7 +64,7 @@ public function testFormattedToNumber($locale, $style, $type, $value, $expected)
         $this->assertEquals($expected, $filter->filter($value));
     }
 
-    static public function numberToFormattedProvider()
+    public static function numberToFormattedProvider()
     {
         return array(
             array(
@@ -91,7 +91,7 @@ static public function numberToFormattedProvider()
         );
     }
 
-    static public function formattedToNumberProvider()
+    public static function formattedToNumberProvider()
     {
         return array(
             array(
-Original file line number
+Diff line change
@@ Expand Up / @@ -333,7 +333,7 @@ public function translatePlural( @@
                     );
                 }
-                return ($number != 1 ? $singular : $plural);
+                return ($number == 1 ? $singular : $plural);
             }
             $index = $this->messages[$textDomain][$locale]
@@ Expand Down @@