mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Don't fail in i18n::include_by_class if the module isn't translatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47847 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
0626a0a15a
commit
e72c08d986
@ -1259,7 +1259,7 @@ class i18n extends Controller {
|
||||
} else if (self::get_locale() != 'en_US') {
|
||||
self::set_locale('en_US');
|
||||
self::include_by_class($class);
|
||||
} else {
|
||||
} else if(file_exists(Director::getAbsFile("$module/lang"))) {
|
||||
// Throw an error if the given module doesn't have translations
|
||||
if($module != project()) {
|
||||
user_error("i18n::include_by_class: Locale file $file should exist", E_USER_WARNING);
|
||||
@ -1328,4 +1328,4 @@ class i18n extends Controller {
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user