diff options
| author | ctrlaltca <ctrlaltca@gmail.com> | 2016-06-15 21:32:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 21:32:16 +0200 |
| commit | f8799b189619993720c5e2689a83637e9eaa884f (patch) | |
| tree | 9fc558eaa5a80bd7c45858d286ad48587e5e30a7 | |
| parent | 2c49016d384559bdd304d37f85e7c696dd33fd9b (diff) | |
| parent | 87cdee402bf6766a061fa926528c5bcc51957bbb (diff) | |
Merge pull request #599 from emkael/master
Allowing translation message cache to be initialized (and used)
| -rw-r--r-- | framework/I18N/TGlobalization.php | 7 | ||||
| -rw-r--r-- | framework/I18N/Translation.php | 2 | ||||
| -rw-r--r-- | framework/pradolite.php | 15 |
3 files changed, 19 insertions, 5 deletions
diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php index 41c89c19..2965ad1b 100644 --- a/framework/I18N/TGlobalization.php +++ b/framework/I18N/TGlobalization.php @@ -214,7 +214,7 @@ class TGlobalization extends TModule throw new TConfigurationException("invalid source dir '{$config['source']}'"); } } - if($config['cache']) + if(isset($config['cache']) && TPropertyValue::ensureBoolean($config['cache'])) { $config['cache'] = $this->getApplication()->getRunTimePath().'/i18n'; if(!is_dir($config['cache'])) @@ -225,6 +225,10 @@ class TGlobalization extends TModule chmod($config['cache'], PRADO_CHMOD); //make it deletable } } + else + { + unset($config['cache']); + } $this->_translation = $config; } @@ -294,4 +298,3 @@ class TGlobalization extends TModule } } - diff --git a/framework/I18N/Translation.php b/framework/I18N/Translation.php index 4e244a49..f22a68f0 100644 --- a/framework/I18N/Translation.php +++ b/framework/I18N/Translation.php @@ -51,7 +51,7 @@ class Translation extends TComponent $source->setCulture($app->getCulture()); - if(TPropertyValue::ensureBoolean($config['cache'])) + if(isset($config['cache'])) $source->setCache(new MessageCache($config['cache'])); self::$formatters[$catalogue] = new MessageFormat($source, $app->getCharset()); diff --git a/framework/pradolite.php b/framework/pradolite.php index 04ecec4c..6b514845 100644 --- a/framework/pradolite.php +++ b/framework/pradolite.php @@ -1,7 +1,7 @@ <?php /** * File Name: pradolite.php - * Last Update: 2016/05/08 19:49:20 + * Last Update: 2016/06/08 16:06:00 * Generated By: buildscripts/phpbuilder/build.php * * This file is used in lieu of prado.php to boost PRADO application performance. @@ -4518,6 +4518,13 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable else return parent::__get($name); } + public function __isset($name) { + if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) { + return true; + } else { + return parent::__isset($name); + } + } public function getHasAdapter() { return isset($this->_rf[self::RF_ADAPTER]); @@ -10287,7 +10294,7 @@ class TGlobalization extends TModule throw new TConfigurationException("invalid source dir '{$config['source']}'"); } } - if($config['cache']) + if(isset($config['cache']) && TPropertyValue::ensureBoolean($config['cache'])) { $config['cache'] = $this->getApplication()->getRunTimePath().'/i18n'; if(!is_dir($config['cache'])) @@ -10297,6 +10304,10 @@ class TGlobalization extends TModule $config['cache']); chmod($config['cache'], PRADO_CHMOD); } } + else + { + unset($config['cache']); + } $this->_translation = $config; } public function getTranslationCatalogue() |