Skip to content

[Translation] Fixed the addition of the fallbackLocale catalogue to the current locale catalogue. #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Feb 27, 2011
Merged

[Translation] Fixed the addition of the fallbackLocale catalogue to the current locale catalogue. #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6049be
[Translation] Added search to FallbackLocale Catalogue.
Feb 24, 2011
381d1e2
[Translation] Fixed the addition of the fallbackLocale catalogue to t…
Feb 25, 2011
db1ea0d
[Translation] Modified Translation unit test "testTransWithFallbackLo…
Feb 27, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Symfony/Component/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
protected function loadCatalogue($locale)
{
$this->catalogues[$locale] = new MessageCatalogue($locale);
if (!isset($this->resources[$locale])) {
return;
}

foreach ($this->resources[$locale] as $resource) {
if (!isset($this->loaders[$resource[0]])) {
throw new \RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
if (isset($this->resources[$locale])) {

foreach ($this->resources[$locale] as $resource) {
if (!isset($this->loaders[$resource[0]])) {
throw new \RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
}
$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
}
$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
}

$this->optimizeCatalogue($locale);
Expand Down
4 changes: 3 additions & 1 deletion tests/Symfony/Tests/Component/Translation/TranslatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ public function testSetFallbackLocale()

public function testTransWithFallbackLocale()
{
$translator = new Translator('en_US', new MessageSelector());
$translator = new Translator('fr_FR', new MessageSelector());
$translator->addLoader('array', new ArrayLoader());
$translator->addResource('array', array('foo' => 'foofoo'), 'en_US');
$translator->addResource('array', array('bar' => 'foobar'), 'en');

$translator->setFallbackLocale('en');

$this->assertEquals('foobar', $translator->trans('bar'));
}

Expand Down