Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2012-02-25 09:59:30 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-02-25 09:59:30 +0400
commit1453b2039458601ee22bbdf5e848114112e89c25 (patch)
tree079cb7a926d2e2bbe91f5da018555a37843f11d2 /core/Translate.php
parent681d4437d908218b26b79da7b84008d8b72d9431 (diff)
Fixing regression introduced earlier today
git-svn-id: http://dev.piwik.org/svn/trunk@5908 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Translate.php')
-rw-r--r--core/Translate.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/core/Translate.php b/core/Translate.php
index f9fbb78cc7..cd5db35ad8 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -47,17 +47,10 @@ class Piwik_Translate
{
$language = $this->getLanguageToLoad();
}
- if($language == $this->getLanguageLoaded())
- {
- return;
- }
$this->unloadEnglishTranslation();
$this->loadEnglishTranslation();
- if($language != 'en')
- {
- $this->loadCoreTranslation($language);
- Piwik_PluginsManager::getInstance()->loadPluginTranslations($language);
- }
+ $this->loadCoreTranslation($language);
+ Piwik_PluginsManager::getInstance()->loadPluginTranslations($language);
}
/**