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

MINOR Added array fallback support to i18nSSLegacyAdapter

Browse Source
This commit is contained in:
Ingo Schommer 2011-12-04 18:36:58 +01:00
parent 0e0e5dd07a
commit 326ff4a783
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
i18n/i18nSSLegacyAdapter.php
View File

@ -19,21 +19,23 @@ class i18nSSLegacyAdapter extends Zend_Translate_Adapter implements i18nTranslat
parent::__construct($options);
}
protected function _loadTranslationData($filename, $locale, array $options = array()) {
protected function _loadTranslationData($data, $locale, array $options = array()) {
$options = array_merge($this->_options, $options);
if ($options['clear'] || !isset($this->_translate[$locale])) {
$this->_translate[$locale] = array();
}
$this->_filename = $filename;
if(is_array($data)) return array($locale => $data);
$this->_filename = $data;
// Ignore files with other extensions
if(pathinfo($this->_filename, PATHINFO_EXTENSION) != 'php') return;
if (!is_readable($this->_filename)) {
require_once 'Zend/Translate/Exception.php';
throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.');
throw new Zend_Translate_Exception('Error opening translation file \'' . $this->_filename . '\'.');
}
global $lang;