import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -44,6 +44,7 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter {
|
||||
private $_tcontent = null;
|
||||
private $_stag = false;
|
||||
private $_ttag = true;
|
||||
private $_data = array();
|
||||
|
||||
/**
|
||||
* Generates the Qt adapter
|
||||
@ -68,15 +69,11 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter {
|
||||
* @param string $filename QT file to add, full path must be given for access
|
||||
* @param array $option OPTIONAL Options to use
|
||||
* @throws Zend_Translation_Exception
|
||||
* @return array
|
||||
*/
|
||||
protected function _loadTranslationData($filename, $locale, array $options = array())
|
||||
{
|
||||
$options = $options + $this->_options;
|
||||
|
||||
if ($options['clear'] || !isset($this->_translate[$locale])) {
|
||||
$this->_translate[$locale] = array();
|
||||
}
|
||||
|
||||
$this->_data = array();
|
||||
if (!is_readable($filename)) {
|
||||
require_once 'Zend/Translate/Exception.php';
|
||||
throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.');
|
||||
@ -99,6 +96,8 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter {
|
||||
require_once 'Zend/Translate/Exception.php';
|
||||
throw new Zend_Translate_Exception($ex);
|
||||
}
|
||||
|
||||
return $this->_data;
|
||||
}
|
||||
|
||||
private function _startElement($file, $name, $attrib)
|
||||
@ -131,8 +130,8 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter {
|
||||
|
||||
case 'translation':
|
||||
if (!empty($this->_scontent) and !empty($this->_tcontent) or
|
||||
(isset($this->_translate[$this->_target][$this->_scontent]) === false)) {
|
||||
$this->_translate[$this->_target][$this->_scontent] = $this->_tcontent;
|
||||
(isset($this->_data[$this->_target][$this->_scontent]) === false)) {
|
||||
$this->_data[$this->_target][$this->_scontent] = $this->_tcontent;
|
||||
}
|
||||
$this->_ttag = false;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user