Apr 14, 2015 · Apr 11, 2015
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
        $this->assertEquals('bar', $translator->trans('bar'));
    }

    public function testGetCatalogueBehavesConsistently()
    {
        /*
         * Create a translator that loads two catalogues for two different locales.
         * The catalogues contain distinct sets of messages.
         */
        $translator = new Translator('a', null, $this->tmpDir);
        $translator->setFallbackLocales(array('b'));

        $translator->addLoader('array', new ArrayLoader());
        $translator->addResource('array', array('foo' => 'foo (a)'), 'a');
        $translator->addResource('array', array('foo' => 'foo (b)'), 'b');
        $translator->addResource('array', array('bar' => 'bar (b)'), 'b');

        $catalogue = $translator->getCatalogue('a');
        $this->assertFalse($catalogue->defines('bar')); // Sure, the "a" catalogue does not contain that message.

        $fallback = $catalogue->getFallbackCatalogue();
        $this->assertTrue($fallback->defines('foo')); // "foo" is present in "a" and "b"

        /*
         * Now, repeat the same test.
         * Behind the scenes, the cache is used. But that should not matter, right?
         */
        $translator = new Translator('a', null, $this->tmpDir);
        $translator->setFallbackLocales(array('b'));

        $translator->addLoader('array', new ArrayLoader());
        $translator->addResource('array', array('foo' => 'foo (a)'), 'a');
        $translator->addResource('array', array('foo' => 'foo (b)'), 'b');
        $translator->addResource('array', array('bar' => 'bar (b)'), 'b');

        $catalogue = $translator->getCatalogue('a');
        $this->assertFalse($catalogue->defines('bar'));

        $fallback = $catalogue->getFallbackCatalogue();
        $this->assertTrue($fallback->defines('foo'));
    }

    protected function getCatalogue($locale, $messages)
    {
        $catalogue = new MessageCatalogue($locale);
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php

    private function getFallbackContent(MessageCatalogue $catalogue)
    {
        if (!$this->debug) {
            // merge all fallback catalogues messages into $catalogue
            $fallbackCatalogue = $catalogue->getFallbackCatalogue();
            $messages = $catalogue->all();
            while ($fallbackCatalogue) {
                $messages = array_replace_recursive($fallbackCatalogue->all(), $messages);
                $fallbackCatalogue = $fallbackCatalogue->getFallbackCatalogue();
            }
            foreach ($messages as $domain => $domainMessages) {
                $catalogue->add($domainMessages, $domain);
            }

            return '';
        }

        $fallbackContent = '';
        $current = '';
        $replacementPattern = '/[^a-z0-9_]/i';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,6 +196,45 @@ public function testDifferentCacheFilesAreUsedForDifferentSetsOfFallbackLocales(
		$this->assertEquals('bar', $translator->trans('bar'));
		}

		public function testGetCatalogueBehavesConsistently()
		{
		/*
		* Create a translator that loads two catalogues for two different locales.
		* The catalogues contain distinct sets of messages.
		*/
		$translator = new Translator('a', null, $this->tmpDir);
		$translator->setFallbackLocales(array('b'));

		$translator->addLoader('array', new ArrayLoader());
		$translator->addResource('array', array('foo' => 'foo (a)'), 'a');
		$translator->addResource('array', array('foo' => 'foo (b)'), 'b');
		$translator->addResource('array', array('bar' => 'bar (b)'), 'b');

		$catalogue = $translator->getCatalogue('a');
		$this->assertFalse($catalogue->defines('bar')); // Sure, the "a" catalogue does not contain that message.

		$fallback = $catalogue->getFallbackCatalogue();
		$this->assertTrue($fallback->defines('foo')); // "foo" is present in "a" and "b"

		/*
		* Now, repeat the same test.
		* Behind the scenes, the cache is used. But that should not matter, right?
		*/
		$translator = new Translator('a', null, $this->tmpDir);
		$translator->setFallbackLocales(array('b'));

		$translator->addLoader('array', new ArrayLoader());
		$translator->addResource('array', array('foo' => 'foo (a)'), 'a');
		$translator->addResource('array', array('foo' => 'foo (b)'), 'b');
		$translator->addResource('array', array('bar' => 'bar (b)'), 'b');

		$catalogue = $translator->getCatalogue('a');
		$this->assertFalse($catalogue->defines('bar'));

		$fallback = $catalogue->getFallbackCatalogue();
		$this->assertTrue($fallback->defines('foo'));
		}

		protected function getCatalogue($locale, $messages)
		{
		$catalogue = new MessageCatalogue($locale);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -420,21 +420,6 @@ public function dumpCatalogue($locale, ConfigCacheInterface $cache)

		private function getFallbackContent(MessageCatalogue $catalogue)
		{
		if (!$this->debug) {
		// merge all fallback catalogues messages into $catalogue
		$fallbackCatalogue = $catalogue->getFallbackCatalogue();
		$messages = $catalogue->all();
		while ($fallbackCatalogue) {
		$messages = array_replace_recursive($fallbackCatalogue->all(), $messages);
		$fallbackCatalogue = $fallbackCatalogue->getFallbackCatalogue();
		}
		foreach ($messages as $domain => $domainMessages) {
		$catalogue->add($domainMessages, $domain);
		}

		return '';
		}

		$fallbackContent = '';
		$current = '';
		$replacementPattern = '/[^a-z0-9_]/i';
Expand Down