From cb68ad1ede299ce826989858171456b82a6f7ee5 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 26 Dec 2014 20:56:18 +1300
Subject: [PATCH] Fixed small bug
---
core/Translation/Translator.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php
index eb98f7f623..6968bbfc84 100644
--- a/core/Translation/Translator.php
+++ b/core/Translation/Translator.php
@@ -308,7 +308,7 @@ class Translator
public function loadPluginsTranslations($language = false)
{
if (empty($language)) {
- $language = self::getLanguageToLoad();
+ $language = $this->getLanguageToLoad();
}
$pluginManager = Manager::getInstance();
@@ -331,7 +331,7 @@ class Translator
is_array($translations) &&
!Development::isEnabled()) { // TODO remove this one here once we have environments in DI
- self::mergeTranslationArray($translations);
+ $this->mergeTranslationArray($translations);
return;
}
--
GitLab