Merge pull request #8432 from chinpei215/i18n-context

Fix __xn() and __dxn() so that plural forms are used.
cakephp · Mar 9, 2016 · a74c312 · a74c312
2 parents 8b7d392 + 114914e
commit a74c312
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/I18n/functions.php b/src/I18n/functions.php
@@ -159,7 +159,7 @@ function __xn($context, $singular, $plural, $count, $args = null)
 
         $arguments = func_num_args() === 5 ? (array)$args : array_slice(func_get_args(), 2);
         return I18n::translator()->translate(
-            $singular,
+            $plural,
             ['_count' => $count, '_singular' => $singular, '_context' => $context] + $arguments
         );
     }
@@ -218,7 +218,7 @@ function __dxn($domain, $context, $singular, $plural, $count, $args = null)
 
         $arguments = func_num_args() === 6 ? (array)$args : array_slice(func_get_args(), 2);
         return I18n::translator($domain)->translate(
-            $singular,
+            $plural,
             ['_count' => $count, '_singular' => $singular, '_context' => $context] + $arguments
         );
     }

diff --git a/tests/TestCase/I18n/I18nTest.php b/tests/TestCase/I18n/I18nTest.php
@@ -325,6 +325,12 @@ public function testPluralContextFunction()
             $package = new Package('default');
             $package->setMessages([
                 'letter' => [
+                    '_context' => [
+                        'character' => 'The letter {0}',
+                        'communication' => 'She wrote a letter to {0}',
+                    ]
+                ],
+                'letters' => [
                     '_context' => [
                         'character' => [
                             'The letter {0}',
@@ -390,6 +396,12 @@ public function testDomainPluralContextFunction()
             $package = new Package('default');
             $package->setMessages([
                 'letter' => [
+                    '_context' => [
+                        'character' => 'The letter {0}',
+                        'communication' => 'She wrote a letter to {0}',
+                    ]
+                ],
+                'letters' => [
                     '_context' => [
                         'character' => [
                             'The letter {0}',