aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCrizzo <mail@crizzo.de>2014-03-09 18:58:48 +0100
committerCrizzo <mail@crizzo.de>2014-03-10 18:35:23 +0100
commitec4c9833ca7ada13262183d5ea25c48bebc8773b (patch)
treea8031c454c0586bf8968a5f465edd5df7c6813fd
parent00f8fe24d2641823f51990b30d5a3f84884a78a6 (diff)
downloadforums-ec4c9833ca7ada13262183d5ea25c48bebc8773b.tar
forums-ec4c9833ca7ada13262183d5ea25c48bebc8773b.tar.gz
forums-ec4c9833ca7ada13262183d5ea25c48bebc8773b.tar.bz2
forums-ec4c9833ca7ada13262183d5ea25c48bebc8773b.tar.xz
forums-ec4c9833ca7ada13262183d5ea25c48bebc8773b.zip
[ticket/10549] Adds language variables
PHPBB3-10549
-rw-r--r--phpBB/includes/functions_module.php6
-rw-r--r--phpBB/language/en/common.php3
2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index d0e7c8cfc8..bb6913a572 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -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))
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f37f6d3b30..663369b8fa 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -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',