tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source
This commit is contained in:
Ingo Schommer 2013-06-02 23:31:09 +02:00
commit 0ecec24688
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i18n/i18nTextCollector.php
View File

@ -155,7 +155,7 @@ class i18nTextCollector extends Object {
// Currently not possible because adapter instances can't be fully reset through the Zend API, // Currently not possible because adapter instances can't be fully reset through the Zend API,
// meaning master strings accumulate across modules // meaning master strings accumulate across modules
if($mergeWithExisting) { if($mergeWithExisting) {
$adapter = Injector::inst()->get('i18nRailsYamlAdapter'); $adapter = Injector::inst()->create('i18nRailsYamlAdapter');
$masterFile = "{$this->basePath}/{$module}/lang/" $masterFile = "{$this->basePath}/{$module}/lang/"
. $adapter->getFilenameForLocale($this->defaultLocale); . $adapter->getFilenameForLocale($this->defaultLocale);
if(!file_exists($masterFile)) continue; if(!file_exists($masterFile)) continue;