diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2008-09-05 03:24:26 +0400 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2008-09-05 03:24:26 +0400 |
| commit | 4edf54f75532cdd7b7be3c53a43ad39d54d66bdd (patch) | |
| tree | e3dbb8c697624c393bfbcc19afcbc23283cb8261 /core/Translate.php | |
| parent | 51368bdcffcbe0ac89e89f9443135332f0b6455c (diff) | |
Refactoring Widget and Menu code (in core and all plugins)
Commit patch by Maciej adding support for multiple lines plotting
Cleaning Date object
+ small other code improvements
git-svn-id: http://dev.piwik.org/svn/trunk@622 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Translate.php')
| -rw-r--r-- | core/Translate.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Translate.php b/core/Translate.php index 007266e0e6..1ce4673c11 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -33,7 +33,7 @@ class Piwik_Translate public function loadEnglishTranslation() { require "lang/en.php"; - $this->addTranslationArray($translations); + $this->mergeTranslationArray($translations); $this->setLocale(); $this->englishLanguageLoaded = true; } @@ -48,11 +48,11 @@ class Piwik_Translate } require "lang/" . $language . ".php"; - $this->addTranslationArray($translations); + $this->mergeTranslationArray($translations); $this->setLocale(); } - public function addTranslationArray($translation) + public function mergeTranslationArray($translation) { if(!isset($GLOBALS['Piwik_translations'])) { |