1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00

Merge pull request from Crizz0/ticket/10549

[ticket/10549] Adds language variables to Error messages MODULE...
This commit is contained in:
Nathan Guse
2014-03-10 21:40:44 -05:00
2 changed files with 6 additions and 3 deletions
phpBB

@ -436,21 +436,21 @@ class p_master
if ($this->active_module === false)
{
trigger_error('Module not accessible', E_USER_ERROR);
trigger_error('MODULE_NOT_ACCESS', E_USER_ERROR);
}
if (!class_exists("{$this->p_class}_$this->p_name"))
{
if (!file_exists("$module_path/{$this->p_class}_$this->p_name.$phpEx"))
{
trigger_error("Cannot find module $module_path/{$this->p_class}_$this->p_name.$phpEx", E_USER_ERROR);
trigger_error($user->lang('MODULE_NOT_FIND', "$module_path/{$this->p_class}_$this->p_name.$phpEx"), E_USER_ERROR);
}
include("$module_path/{$this->p_class}_$this->p_name.$phpEx");
if (!class_exists("{$this->p_class}_$this->p_name"))
{
trigger_error("Module file $module_path/{$this->p_class}_$this->p_name.$phpEx does not contain correct class [{$this->p_class}_$this->p_name]", E_USER_ERROR);
trigger_error($user->lang('MODULE_FILE_RIGHT_CLASS', "$module_path/{$this->p_class}_$this->p_name.$phpEx", "{$this->p_class}_$this->p_name"), E_USER_ERROR);
}
if (!empty($mode))

@ -341,6 +341,9 @@ $lang = array_merge($lang, array(
'MODERATE' => 'Moderate',
'MODERATOR' => 'Moderator',
'MODERATORS' => 'Moderators',
'MODULE_NOT_ACCESS' => 'Module not accessible',
'MODULE_NOT_FIND' => 'Cannot find module %s',
'MODULE_FILE_RIGHT_CLASS' => 'Module file %s does not contain correct class [%s]',
'MONTH' => 'Month',
'MOVE' => 'Move',
'MSNM' => 'MSNM/WLM',