diff options
| author | ctrlaltca@gmail.com <> | 2011-05-21 18:14:36 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-05-21 18:14:36 +0000 |
| commit | 0892b27e326f14bd3f6229b55077ef5f9d5280b4 (patch) | |
| tree | 24039ec47ba8977bf14ba435c058e758e901f185 /framework/I18N/TGlobalization.php | |
| parent | 6f00b28a1d9c7409c956a83866eac48a9493e83c (diff) | |
branch/3.1: merged bugfixes from trunk/ up to current
Diffstat (limited to 'framework/I18N/TGlobalization.php')
| -rw-r--r-- | framework/I18N/TGlobalization.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php index fd16f7bd..6e00dd48 100644 --- a/framework/I18N/TGlobalization.php +++ b/framework/I18N/TGlobalization.php @@ -149,7 +149,9 @@ class TGlobalization extends TModule */
public function getTranslationConfiguration()
{
- return $this->_translation;
+ return ($this->getDefaultCulture() == $this->getCulture())
+ ? null
+ : $this->_translation;
}
/**
|