From 326ff4a78334ae5ad87d49bab374df91d37a59ce Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 4 Dec 2011 18:36:58 +0100 Subject: [PATCH] MINOR Added array fallback support to i18nSSLegacyAdapter --- i18n/i18nSSLegacyAdapter.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/i18n/i18nSSLegacyAdapter.php b/i18n/i18nSSLegacyAdapter.php index 6f5e7aa70..9f784de4d 100644 --- a/i18n/i18nSSLegacyAdapter.php +++ b/i18n/i18nSSLegacyAdapter.php @@ -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;