mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-28 05:02:01 +00:00
4da72aa267
System was using the empty state return from theme_path, when no theme was configured, for loading in languages which would result in the root path being looked up upon. This changes the theme_path helper to return null in cases a theme is not configured instead of empty string to help prevent assumed return path will be legitimate, and to help enforce error case handling. For #2836
32 lines
1.1 KiB
PHP
32 lines
1.1 KiB
PHP
<?php namespace BookStack\Translation;
|
|
|
|
use Illuminate\Translation\FileLoader as BaseLoader;
|
|
|
|
class FileLoader extends BaseLoader
|
|
{
|
|
/**
|
|
* Load the messages for the given locale.
|
|
* Extends Laravel's translation FileLoader to look in multiple directories
|
|
* so that we can load in translation overrides from the theme file if wanted.
|
|
* @param string $locale
|
|
* @param string $group
|
|
* @param string|null $namespace
|
|
* @return array
|
|
*/
|
|
public function load($locale, $group, $namespace = null)
|
|
{
|
|
if ($group === '*' && $namespace === '*') {
|
|
return $this->loadJsonPaths($locale);
|
|
}
|
|
|
|
if (is_null($namespace) || $namespace === '*') {
|
|
$themePath = theme_path('lang');
|
|
$themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : [];
|
|
$originalTranslations = $this->loadPath($this->path, $locale, $group);
|
|
return array_merge($originalTranslations, $themeTranslations);
|
|
}
|
|
|
|
return $this->loadNamespaced($locale, $group, $namespace);
|
|
}
|
|
}
|