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

support user and system languages

Browse Source
This commit is contained in:
Andy Miller
2015-08-08 14:44:30 -06:00
parent aacd9732f2
commit 76c4da7945
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,10 +373,11 @@ class Config extends Data
$content = $lang_file->content();
$this->languages->mergeRecursive($content);
}
unset($languageFiles['user/plugins']);
}
if (isset($languageFiles['system/languages'])) {
foreach ((array) $languageFiles['system/languages'] as $lang => $item) {
foreach ($languageFiles as $location) {
foreach ($location as $lang => $item) {
$lang_file = CompiledYamlFile::instance($item['file']);
$content = $lang_file->content();
$this->languages->join($lang, $content, '/');