Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-16 17:41:02 +01:00
Code Issues Packages Projects Releases Activity

Minor code improvement

Browse Source
This commit is contained in:
Flavio Copes
2016-02-25 17:21:07 +01:00
parent db7da685ae
commit 74e4e4d6ee
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/src/Grav/Common/Language/Language.php
View File

@@ -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);
}

2
system/src/Grav/Common/Service/ConfigServiceProvider.php
View File

@@ -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 */