diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 21:44:04 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 21:44:04 -0500 |
| commit | 3181c44fc98c1dbba123bf9be7c862716d122694 (patch) | |
| tree | b7ba2695a9f0bbe63bd608cdea3650a1b27c321f /phpBB/includes/functions_module.php | |
| parent | 92b638ed83e5d66fdcb1d18914aab9495d1a6aea (diff) | |
| parent | ea63e1412bb5eb31d4b59d30c6e880ebc06c71c3 (diff) | |
| download | forums-3181c44fc98c1dbba123bf9be7c862716d122694.tar forums-3181c44fc98c1dbba123bf9be7c862716d122694.tar.gz forums-3181c44fc98c1dbba123bf9be7c862716d122694.tar.bz2 forums-3181c44fc98c1dbba123bf9be7c862716d122694.tar.xz forums-3181c44fc98c1dbba123bf9be7c862716d122694.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10549] Adds language variables
Conflicts:
phpBB/includes/functions_module.php
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 53055752f6..28af7994c8 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -495,7 +495,7 @@ class p_master 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 @@ -503,14 +503,14 @@ class p_master { 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"); 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); } } |