makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php
This commit is contained in:
Nathan Guse 2014-03-10 21:44:04 -05:00
commit 3181c44fc9
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions_module.php
View file

@ -495,7 +495,7 @@ class p_master
if ($this->active_module === false) if ($this->active_module === false)
{ {
trigger_error('Module not accessible', E_USER_ERROR); trigger_error('MODULE_NOT_ACCESS', E_USER_ERROR);
} }
// new modules use the full class names, old ones are always called <type>_<name>, e.g. acp_board // new modules use the full class names, old ones are always called <type>_<name>, e.g. acp_board
@ -503,14 +503,14 @@ class p_master
{ {
if (!file_exists("$module_path/{$this->p_name}.$phpEx")) if (!file_exists("$module_path/{$this->p_name}.$phpEx"))
{ {
trigger_error("Cannot find module $module_path/{$this->p_name}.$phpEx", E_USER_ERROR); trigger_error($user->lang('MODULE_NOT_FIND', "$module_path/{$this->p_name}.$phpEx"), E_USER_ERROR);
} }
include("$module_path/{$this->p_name}.$phpEx"); include("$module_path/{$this->p_name}.$phpEx");
if (!class_exists($this->p_name)) if (!class_exists($this->p_name))
{ {
trigger_error("Module file $module_path/{$this->p_name}.$phpEx does not contain correct class [{$this->p_name}]", E_USER_ERROR); trigger_error($user->lang('MODULE_FILE_RIGHT_CLASS', "$module_path/{$this->p_name}.$phpEx", $this->p_name), E_USER_ERROR);
} }
} }

3
phpBB/language/en/common.php
View file

@ -402,6 +402,9 @@ $lang = array_merge($lang, array(
'MODERATE' => 'Moderate', 'MODERATE' => 'Moderate',
'MODERATOR' => 'Moderator', 'MODERATOR' => 'Moderator',
'MODERATORS' => 'Moderators', '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', 'MONTH' => 'Month',
'MOVE' => 'Move', 'MOVE' => 'Move',