diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
index 1412a786a79b7..cf8a4b8553dd4 100644
--- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
@@ -126,23 +126,24 @@ protected function loadResource($resource)
*/
private function addMessage(array &$messages, array $item)
{
- if (\is_array($item['translated'])) {
- $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated'][0]);
+ if (!empty($item['ids']['singular'])) {
+ $id = stripcslashes($item['ids']['singular']);
if (isset($item['ids']['plural'])) {
- $plurals = $item['translated'];
- // PO are by definition indexed so sort by index.
- ksort($plurals);
- // Make sure every index is filled.
- end($plurals);
- $count = key($plurals);
- // Fill missing spots with '-'.
- $empties = array_fill(0, $count + 1, '-');
- $plurals += $empties;
- ksort($plurals);
- $messages[stripcslashes($item['ids']['plural'])] = stripcslashes(implode('|', $plurals));
+ $id .= '|'.stripcslashes($item['ids']['plural']);
}
- } elseif (!empty($item['ids']['singular'])) {
- $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated']);
+
+ $translated = (array) $item['translated'];
+ // PO are by definition indexed so sort by index.
+ ksort($translated);
+ // Make sure every index is filled.
+ end($translated);
+ $count = key($translated);
+ // Fill missing spots with '-'.
+ $empties = array_fill(0, $count + 1, '-');
+ $translated += $empties;
+ ksort($translated);
+
+ $messages[$id] = stripcslashes(implode('|', $translated));
}
}
}
diff --git a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
index d8e2c1993ba1c..cb94e90a9408f 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
@@ -34,7 +34,10 @@ public function testLoadPlurals()
$resource = __DIR__.'/../fixtures/plurals.po';
$catalogue = $loader->load($resource, 'en', 'domain1');
- $this->assertEquals(['foo' => 'bar', 'foos' => 'bar|bars'], $catalogue->all('domain1'));
+ $this->assertEquals([
+ 'foo|foos' => 'bar|bars',
+ '{0} no foos|one foo|%count% foos' => '{0} no bars|one bar|%count% bars',
+ ], $catalogue->all('domain1'));
$this->assertEquals('en', $catalogue->getLocale());
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
@@ -89,10 +92,8 @@ public function testEscapedIdPlurals()
$catalogue = $loader->load($resource, 'en', 'domain1');
$messages = $catalogue->all('domain1');
- $this->assertArrayHasKey('escaped "foo"', $messages);
- $this->assertArrayHasKey('escaped "foos"', $messages);
- $this->assertEquals('escaped "bar"', $messages['escaped "foo"']);
- $this->assertEquals('escaped "bar"|escaped "bars"', $messages['escaped "foos"']);
+ $this->assertArrayHasKey('escaped "foo"|escaped "foos"', $messages);
+ $this->assertEquals('escaped "bar"|escaped "bars"', $messages['escaped "foo"|escaped "foos"']);
}
public function testSkipFuzzyTranslations()
@@ -106,4 +107,16 @@ public function testSkipFuzzyTranslations()
$this->assertArrayNotHasKey('foo2', $messages);
$this->assertArrayHasKey('foo3', $messages);
}
+
+ public function testMissingPlurals()
+ {
+ $loader = new PoFileLoader();
+ $resource = __DIR__.'/../fixtures/missing-plurals.po';
+ $catalogue = $loader->load($resource, 'en', 'domain1');
+
+ $this->assertEquals([
+ 'foo|foos' => '-|bar|-|bars',
+ ], $catalogue->all('domain1'));
+ $this->assertEquals('en', $catalogue->getLocale());
+ }
}
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/missing-plurals.po b/src/Symfony/Component/Translation/Tests/fixtures/missing-plurals.po
new file mode 100644
index 0000000000000..3b47fca805b91
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/fixtures/missing-plurals.po
@@ -0,0 +1,4 @@
+msgid "foo"
+msgid_plural "foos"
+msgstr[3] "bars"
+msgstr[1] "bar"
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/plurals.po b/src/Symfony/Component/Translation/Tests/fixtures/plurals.po
index 439c41ad7fef4..61d1ba42b41a1 100644
--- a/src/Symfony/Component/Translation/Tests/fixtures/plurals.po
+++ b/src/Symfony/Component/Translation/Tests/fixtures/plurals.po
@@ -3,3 +3,5 @@ msgid_plural "foos"
msgstr[0] "bar"
msgstr[1] "bars"
+msgid "{0} no foos|one foo|%count% foos"
+msgstr "{0} no bars|one bar|%count% bars"
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy