Merge pull request zendframework/zendframework#6827 from hissy/no-plu…

…ral-form-lang

Fix inability to translate to languages which don't have plural forms

src/Translator/Translator.php

@@ -401,6 +401,8 @@ public function translatePlural(
             }
 
             return ($number == 1 ? $singular : $plural);
+        } elseif (is_string($translation)) {
+            $translation = array($translation);
         }
 
         $index = $this->messages[$textDomain][$locale]

test/Translator/TranslatorTest.php

@@ -219,6 +219,26 @@ public function testTranslatePlurals()
         $this->assertEquals('Message 5 (en) Plural 1', $pl1);
         $this->assertEquals('Message 5 (en) Plural 2', $pl2);
     }
+
+    public function testTranslateNoPlurals()
+    {
+        // Some languages such as Japanese and Chinese does not have plural forms
+        $this->translator->setLocale('ja_JP');
+        $this->translator->addTranslationFile(
+            'phparray',
+            $this->testFilesDir . '/testarray/translation-noplural-ja_JP.php',
+            'default',
+            'ja_JP'
+        );
+
+        $pl0 = $this->translator->translatePlural('Message 9', 'Message 9 Plural', 1);
+        $pl1 = $this->translator->translatePlural('Message 9', 'Message 9 Plural', 2);
+        $pl2 = $this->translator->translatePlural('Message 9', 'Message 9 Plural', 10);
+
+        $this->assertEquals('Message 9 (ja)', $pl0);
+        $this->assertEquals('Message 9 (ja)', $pl1);
+        $this->assertEquals('Message 9 (ja)', $pl2);
+    }
 
     public function testTranslateNonExistantLocale()
     {

test/Translator/_files/testarray/translation-noplural-ja_JP.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+    '' => array(
+        'plural_forms' => 'nplurals=1; plural=0;'
+    ),
+    'Message 9' => 'Message 9 (ja)',
+);