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

fixed translations with multiple plugins

Browse Source
This commit is contained in:
Andy Miller
2015-07-28 12:11:07 -06:00
parent a009c56271
commit d244442e70
2 changed files with 5 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

@@ -414,7 +414,10 @@ class Config extends Data
{
foreach ($files as $name => $item) {
$file = CompiledYamlFile::instance($item['file']);
$this->languages->join($name, $file->content(), '/');
$content = $file->content();
foreach ((array) $content as $key => $value) {
$this->languages->join($key, $value, '/');
}
}
}

2
system/src/Grav/Common/Config/ConfigFinder.php
View File

@@ -143,7 +143,7 @@ class ConfigFinder
$filename = "{$path}/{$name}/$find";
if (file_exists($filename)) {
$list["plugins"] = ['file' => $filename, 'modified' => filemtime($filename)];
$list[$name] = ['file' => $filename, 'modified' => filemtime($filename)];
}
}
}