mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Including template /lang folders in i18n::include_by_locale() (implementation started in r113919)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@114208 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
43c85e3c9a
commit
5236e09026
@ -1467,7 +1467,7 @@ class i18n extends Object {
|
||||
|
||||
// fallback to the passed $string if no translation is present
|
||||
$transEntity = isset($lang[$locale][$class][$realEntity]) ? $lang[$locale][$class][$realEntity] : $string;
|
||||
|
||||
|
||||
// entities can be stored in both array and literal values in the language tables
|
||||
return (is_array($transEntity) ? $transEntity[0] : $transEntity);
|
||||
}
|
||||
@ -1841,6 +1841,18 @@ class i18n extends Object {
|
||||
else include_once($file);
|
||||
}
|
||||
}
|
||||
|
||||
// Load translations from themes
|
||||
$themesBase = $base . '/themes';
|
||||
foreach(scandir($themesBase) as $theme) {
|
||||
if(
|
||||
strpos($theme, SSViewer::current_theme()) === 0
|
||||
&& file_exists($file = "$themesBase/$theme/lang/$locale.php")
|
||||
) {
|
||||
if ($force_load) include($file);
|
||||
else include_once($file);
|
||||
}
|
||||
}
|
||||
|
||||
// Finally, load any translations from registered plugins
|
||||
if ($load_plugins) self::plugins_load($locale);
|
||||
|
Loading…
Reference in New Issue
Block a user