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

Load language files according to stream configurations

Browse Source
This commit is contained in:
Sommerregen
2015-10-04 17:55:51 +02:00
parent e5933811fd
commit 0fa53d5f5d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
system/src/Grav/Common/Config/Config.php
View File

@@ -366,14 +366,16 @@ class Config extends Data
// Load languages.
$this->languages = new Languages;
if (isset($languageFiles['user/plugins'])) {
foreach ((array) $languageFiles['user/plugins'] as $plugin => $item) {
$lang_file = CompiledYamlFile::instance($item['file']);
$content = $lang_file->content();
$this->languages->mergeRecursive($content);
$pluginPaths = str_ireplace(GRAV_ROOT . '/', '', array_reverse($plugins));
foreach ($pluginPaths as $path) {
if (isset($languageFiles[$path])) {
foreach ((array) $languageFiles[$path] as $plugin => $item) {
$lang_file = CompiledYamlFile::instance($item['file']);
$content = $lang_file->content();
$this->languages->mergeRecursive($content);
}
unset($languageFiles[$path]);
}
unset($languageFiles['user/plugins']);
}
foreach ($languageFiles as $location) {