Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3262' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3262
  • Loading branch information
@weierophinney
weierophinney committed Jan 3, 2013
96 parents 9e59ae6 + b96f402 + 913f51c + 39924f3 + c2a11e1 + 61b9322 + 413a38b + e51b2b8 + 20e328b + 6437ec0 + e9b8476 + 95e54a0 + 7ea3aed + df6a706 + a82fc82 + 7c2a059 + 4fefb53 + 599ee3a + ea3fc65 + f6c04c2 + 6591e3d + a4f76e3 + 33c7531 + 2d59782 + 8152327 + e56ce9b + db9b18f + b88635a + a262823 + b79aef6 + c2284e4 + 70193eb + 96acf77 + 9675426 + 5f02411 + 0dafea7 + 15dc674 + 4a2447d + e6eb7f3 + e9499c5 + 272b15f + 11c7758 + 6f0e918 + 5f4980a + ecca95a + 88b5971 + ecb8d13 + 9de1c08 + 44aad17 + 13269e9 + 654cdb6 + dc708db + 380ffba + ff67e7f + fe2e025 + 95f0efa + 68cc4b3 + bf13b96 + 8870381 + 56480f4 + 1fa90d7 + 5c7fe1f + abe9bc1 + a33cacd + cdd7d9f + 6a261b1 + 5e594c4 + 01c1241 + 30d1dd2 + d4af079 + c9aa9b4 + 10f47ca + ef20fa1 + 2187ae2 + e7f3993 + db93d37 + aa57612 + 4af81d8 + 2f90998 + 3013404 + 69d83fe + f383ca9 + 1b26f48 + b36e36b + 60fa081 + be1ce44 + 9e2c9d5 + 5a6465d + 7e455b4 + 054f09d + 83d837e + 28bc01e + 215be48 + efcc8e0 + 5865e20 + a085813 commit 9ee28ff
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 39 deletions.
104 changes: 65 additions & 39 deletions src/Translator/Translator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class Translator
/**
* Instantiate a translator
*
* @param array|Traversable $options
* @param array|Traversable $options
* @return Translator
* @throws Exception\InvalidArgumentException
*/
Expand Down Expand Up @@ -208,12 +208,13 @@ public static function factory($options)
/**
* Set the default locale.
*
* @param string $locale
* @param string $locale
* @return Translator
*/
public function setLocale($locale)
{
$this->locale = $locale;

return $this;
}

Expand All @@ -234,12 +235,13 @@ public function getLocale()
/**
* Set the fallback locale.
*
* @param string $locale
* @param string $locale
* @return Translator
*/
public function setFallbackLocale($locale)
{
$this->fallbackLocale = $locale;

return $this;
}

Expand All @@ -262,6 +264,7 @@ public function getFallbackLocale()
public function setCache(CacheStorage $cache = null)
{
$this->cache = $cache;

return $this;
}

Expand All @@ -284,6 +287,7 @@ public function getCache()
public function setPluginManager(LoaderPluginManager $pluginManager)
{
$this->pluginManager = $pluginManager;

return $this;
}

Expand Down Expand Up @@ -332,11 +336,11 @@ public function translate($message, $textDomain = 'default', $locale = null)
/**
* Translate a plural message.
*
* @param string $singular
* @param string $plural
* @param int $number
* @param string $textDomain
* @param string|null $locale
* @param string $singular
* @param string $plural
* @param int $number
* @param string $textDomain
* @param string|null $locale
* @return string
* @throws Exception\OutOfBoundsException
*/
Expand Down Expand Up @@ -382,9 +386,9 @@ public function translatePlural(
/**
* Get a translated message.
*
* @param string $message
* @param string $locale
* @param string $textDomain
* @param string $message
* @param string $locale
* @param string $textDomain
* @return string|null
*/
protected function getTranslatedMessage(
Expand All @@ -410,10 +414,10 @@ protected function getTranslatedMessage(
/**
* Add a translation file.
*
* @param string $type
* @param string $filename
* @param string $textDomain
* @param string $locale
* @param string $type
* @param string $filename
* @param string $textDomain
* @param string $locale
* @return Translator
*/
public function addTranslationFile(
Expand All @@ -428,8 +432,8 @@ public function addTranslationFile(
$this->files[$textDomain] = array();
}

$this->files[$textDomain][$locale] = array(
'type' => $type,
$this->files[$textDomain][$locale][] = array(
'type' => $type,
'filename' => $filename,
);

Expand All @@ -439,10 +443,10 @@ public function addTranslationFile(
/**
* Add multiple translations with a file pattern.
*
* @param string $type
* @param string $baseDir
* @param string $pattern
* @param string $textDomain
* @param string $type
* @param string $baseDir
* @param string $pattern
* @param string $textDomain
* @return Translator
*/
public function addTranslationFilePattern(
Expand All @@ -467,8 +471,8 @@ public function addTranslationFilePattern(
/**
* Add remote translations.
*
* @param string $type
* @param string $textDomain
* @param string $type
* @param string $textDomain
* @return Translator
*/
public function addRemoteTranslations($type, $textDomain = 'default')
Expand All @@ -485,8 +489,8 @@ public function addRemoteTranslations($type, $textDomain = 'default')
/**
* Load messages for a given language and domain.
*
* @param string $textDomain
* @param string $locale
* @param string $textDomain
* @param string $locale
* @throws Exception\RuntimeException
* @return void
*/
Expand All @@ -501,10 +505,13 @@ protected function loadMessages($textDomain, $locale)

if (null !== ($result = $cache->getItem($cacheId))) {
$this->messages[$textDomain][$locale] = $result;

return;
}
}

$hasToCache = false;

// Try to load from remote sources
if (isset($this->remote[$textDomain])) {
foreach ($this->remote[$textDomain] as $loaderType) {
Expand All @@ -514,8 +521,15 @@ protected function loadMessages($textDomain, $locale)
throw new Exception\RuntimeException('Specified loader is not a remote loader');
}

$this->messages[$textDomain][$locale] = $loader->load($locale, $textDomain);
goto cache;
if (isset($this->messages[$textDomain][$locale])) {
$this->messages[$textDomain][$locale]->exchangeArray(array_merge(
(array) $this->messages[$textDomain][$locale],
(array) $loader->load($locale, $textDomain)
));
} else {
$this->messages[$textDomain][$locale] = $loader->load($locale, $textDomain);
}
$hasToCache = true;
}
}

Expand All @@ -531,8 +545,15 @@ protected function loadMessages($textDomain, $locale)
throw new Exception\RuntimeException('Specified loader is not a file loader');
}

$this->messages[$textDomain][$locale] = $loader->load($locale, $filename);
goto cache;
if (isset($this->messages[$textDomain][$locale])) {
$this->messages[$textDomain][$locale]->exchangeArray(array_merge(
(array) $this->messages[$textDomain][$locale],
(array) $loader->load($locale, $filename)
));
} else {
$this->messages[$textDomain][$locale] = $loader->load($locale, $filename);
}
$hasToCache = true;
}
}
}
Expand All @@ -542,23 +563,28 @@ protected function loadMessages($textDomain, $locale)
if (!isset($this->files[$textDomain][$currentLocale])) {
continue;
}
foreach ($this->files[$textDomain][$currentLocale] as $file) {
$loader = $this->getPluginManager()->get($file['type']);

$file = $this->files[$textDomain][$currentLocale];
$loader = $this->getPluginManager()->get($file['type']);
if (!$loader instanceof FileLoaderInterface) {
throw new Exception\RuntimeException('Specified loader is not a file loader');
}

if (!$loader instanceof FileLoaderInterface) {
throw new Exception\RuntimeException('Specified loader is not a file loader');
if (isset($this->messages[$textDomain][$locale])) {
$this->messages[$textDomain][$locale]->exchangeArray(array_merge(
(array) $this->messages[$textDomain][$locale],
(array) $loader->load($locale, $file['filename'])
));
} else {
$this->messages[$textDomain][$locale] = $loader->load($locale, $file['filename']);
}
$hasToCache = true;
}

$this->messages[$textDomain][$locale] = $loader->load($locale, $file['filename']);

unset($this->files[$textDomain][$currentLocale]);
goto cache;
}

// Cache the loaded text domain
cache:
if ($cache !== null) {
if ($hasToCache && $cache !== null) {
$cache->setItem($cacheId, $this->messages[$textDomain][$locale]);
}
}
Expand Down
26 changes: 26 additions & 0 deletions test/Translator/TranslatorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,32 @@ public function testFactoryCreatesTranslator()
$this->assertEquals('de_DE', $translator->getLocale());
}

public function testTranslationFromSeveralTranslationFiles()
{
$translator = Translator::factory(array(
'locale' => 'de_DE',
'translation_file_patterns' => array(
array(
'type' => 'phparray',
'base_dir' => $this->testFilesDir . '/testarray',
'pattern' => 'translation-%s.php'
),
array(
'type' => 'phparray',
'base_dir' => $this->testFilesDir . '/testarray',
'pattern' => 'translation-more-%s.php'
)
)
));

//Test translator instance
$this->assertInstanceOf('Zend\I18n\Translator\Translator', $translator);

//Test translations
$this->assertEquals('Nachricht 1', $translator->translate('Message 1')); //translation-de_DE.php
$this->assertEquals('Nachricht 9', $translator->translate('Message 9')); //translation-more-de_DE.php
}

public function testFactoryCreatesTranslatorWithCache()
{
$translator = Translator::factory(array(
Expand Down
14 changes: 14 additions & 0 deletions test/Translator/_files/testarray/translation-more-de_DE.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_I18n
*/

return array(
'Message 2' => 'Nachricht 2',
'Message 9' => 'Nachricht 9'
);
16 changes: 16 additions & 0 deletions test/Translator/_files/testarray/translation-more-en_US.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_I18n
*/

return array(
'Message 5' => 'Message 5 (en)',
'Message 6' => 'Message 6 (en)',
'Message 7' => 'Message 7 (en)',
'Message 8' => 'Message 8 (en)',
);

0 comments on commit 9ee28ff

Please # to comment.