diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php index eb69adcf1..bfa880749 100644 --- a/system/src/Grav/Common/Language/Language.php +++ b/system/src/Grav/Common/Language/Language.php @@ -2,6 +2,7 @@ namespace Grav\Common\Language; use Grav\Common\Grav; +use Grav\Common\Config\Config; /** * Language and translation functionality for Grav @@ -15,7 +16,10 @@ class Language protected $fallback_languages = []; protected $default; protected $active = null; + + /** @var Config $config */ protected $config; + protected $http_accept_language; protected $lang_in_url = false; @@ -406,7 +410,7 @@ class Language } foreach ((array)$languages as $lang) { - $translation_array = (array)$this->config->getLanguages()->get($lang . '.' . $key, null); + $translation_array = (array)Grav::instance()['languages']->get($lang . '.' . $key, null); if ($translation_array && array_key_exists($index, $translation_array)) { return $translation_array[$index]; } @@ -431,7 +435,7 @@ class Language */ public function getTranslation($lang, $key, $array_support = false) { - $translation = $this->config->getLanguages()->get($lang . '.' . $key, null); + $translation = Grav::instance()['languages']->get($lang . '.' . $key, null); if (!$array_support && is_array($translation)) { return (string)array_shift($translation); } diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php index 79c99ed00..bf51270c8 100644 --- a/system/src/Grav/Common/Service/ConfigServiceProvider.php +++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php @@ -90,7 +90,7 @@ class ConfigServiceProvider implements ServiceProviderInterface public static function languages(Container $container) { - /** Setup $setup */ + /** @var Setup $setup */ $setup = $container['setup']; /** @var Config $config */