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

Merge pull request #346 from Sommerregen/bugfix/load-language-files

Browse Source 
Load language files according to stream configurations
This commit is contained in:
Andy Miller
2015-10-08 10:14:04 -06:00
parent 79f244f012 f332cee568
commit 9ef501fe0c
3 changed files with 35 additions and 28 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) {

21
system/src/Grav/Common/Plugins.php
View File

@@ -94,18 +94,21 @@ class Plugins extends Iterator
{
$list = array();
$locator = Grav::instance()['locator'];
$iterator = new \DirectoryIterator($locator->findResource('plugins://', false));
/** @var \DirectoryIterator $directory */
foreach ($iterator as $directory) {
if (!$directory->isDir() || $directory->isDot()) {
continue;
$plugins = (array) $locator->findResources('plugins://', false);
foreach ($plugins as $path) {
$iterator = new \DirectoryIterator($path);
/** @var \DirectoryIterator $directory */
foreach ($iterator as $directory) {
if (!$directory->isDir() || $directory->isDot()) {
continue;
}
$type = $directory->getBasename();
$list[$type] = self::get($type);
}
$type = $directory->getBasename();
$list[$type] = self::get($type);
}
ksort($list);
return $list;

26
system/src/Grav/Common/Themes.php
View File

@@ -60,18 +60,21 @@ class Themes extends Iterator
{
$list = array();
$locator = Grav::instance()['locator'];
$iterator = new \DirectoryIterator($locator->findResource('themes://', false));
/** @var \DirectoryIterator $directory */
foreach ($iterator as $directory) {
if (!$directory->isDir() || $directory->isDot()) {
continue;
$themes = (array) $locator->findResources('themes://', false);
foreach ($themes as $path) {
$iterator = new \DirectoryIterator($path);
/** @var \DirectoryIterator $directory */
foreach ($iterator as $directory) {
if (!$directory->isDir() || $directory->isDot()) {
continue;
}
$type = $directory->getBasename();
$list[$type] = self::get($type);
}
$type = $directory->getBasename();
$list[$type] = self::get($type);
}
ksort($list);
return $list;
@@ -96,9 +99,8 @@ class Themes extends Iterator
// Find thumbnail.
$thumb = "themes://{$name}/thumbnail.jpg";
if (file_exists($thumb)) {
$blueprint->set('thumbnail', $this->grav['base_url'] . "/user/themes/{$name}/thumbnail.jpg");
if ($path = $this->grav['locator']->findResource($thumb, false)) {
$blueprint->set('thumbnail', $this->grav['base_url'] . '/' . $path);
}
// Load default configuration.