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:
authorrobocoder <anthon.pang@gmail.com>2010-03-31 09:38:24 +0400
committerrobocoder <anthon.pang@gmail.com>2010-03-31 09:38:24 +0400
commit3b99f0b0a4094addc88ae35b381d78a0bf1888e3 (patch)
tree75ac9e1d45c90a96dabc880710bf8ba868c0b590 /core/Translate.php
parent75873c86f7a3d9442ab59fa04e78c7888cb755f0 (diff)
fixes #835 - optional language param to select translation
git-svn-id: http://dev.piwik.org/svn/trunk@2022 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Translate.php')
-rw-r--r--core/Translate.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/Translate.php b/core/Translate.php
index da2a09410e..161fa737b8 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -74,9 +74,11 @@ class Piwik_Translate
{
return $language;
}
+
Piwik_PostEvent('Translate.getLanguageToLoad', $language);
- if(is_null($language) || empty($language))
+ $language = Piwik_Common::getRequestVar('language', is_null($language) ? '' : $language, 'string');
+ if(empty($language))
{
$language = Zend_Registry::get('config')->General->default_language;
}