Fix message parsing in Translator.

cakephp · May 22, 2017 · 3fb8761 · 3fb8761
1 parent ce63d42
commit 3fb8761
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/I18n/Translator.php b/src/I18n/Translator.php
@@ -131,7 +131,11 @@ public function translate($key, array $tokensValues = [])
 
             // No or missing context, fallback to the key/first message
             if ($context === null) {
-                $message = current($message['_context']);
+                if (isset($message['_context'][''])) {
+                    $message = $message['_context'][''];
+                } else {
+                    $message = current($message['_context']);
+                }
             } elseif (!isset($message['_context'][$context])) {
                 $message = $key;
             } elseif (is_string($message['_context'][$context]) &&

diff --git a/tests/TestCase/I18n/Parser/PoFileParserTest.php b/tests/TestCase/I18n/Parser/PoFileParserTest.php
@@ -119,7 +119,7 @@ public function testParseContextOnSomeMessages()
         $file = APP . 'Locale' . DS . 'en' . DS . 'context.po';
         $messages = $parser->parse($file);
 
-        I18n::translator('default', 'en_US', function () use ($messages) {
+        I18n::translator('default', 'de_DE', function () use ($messages) {
             $package = new Package('default');
             $package->setMessages($messages);
 
@@ -131,7 +131,7 @@ public function testParseContextOnSomeMessages()
         $this->assertSame('En resolved - context', $messages['Resolved']['_context']['Pay status']);
 
         // Confirm actual behavior
-        I18n::locale('en_US');
+        I18n::locale('de_DE');
         $this->assertSame('En cours', __('Pending'));
         $this->assertSame('En cours - context', __x('Pay status', 'Pending'));
         $this->assertSame('En resolved', __('Resolved'));