Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/528] Correctly load module language for 3rd party modules

Browse Source 
B3P-528
This commit is contained in:
Marc Alexander
2015-04-27 16:18:04 +02:00
parent 6767c6406b
commit d699ef0e3b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/services.yml
View File

@@ -103,6 +103,7 @@ services:
arguments: arguments:
- @cache - @cache
- @dbal.conn - @dbal.conn
- @board3.portal.controller_helper
- @board3.portal.columns - @board3.portal.columns
- @board3.portal.helper - @board3.portal.helper
- @board3.portal.modules.constraints_handler - @board3.portal.modules.constraints_handler

9
portal/modules/manager.php
View File

@@ -20,6 +20,9 @@ class manager
/** @var \phpbb\cache\service */ /** @var \phpbb\cache\service */
protected $cache; protected $cache;
/** @var \board3\portal\controller\helper */
protected $controller_helper;
/** @var \board3\portal\portal\columns */ /** @var \board3\portal\portal\columns */
protected $portal_columns; protected $portal_columns;
@@ -55,6 +58,7 @@ class manager
* *
* @param \phpbb\cache\service $cache phpBB cache * @param \phpbb\cache\service $cache phpBB cache
* @param \phpbb\db\driver\driver_interface $db Database driver * @param \phpbb\db\driver\driver_interface $db Database driver
* @param \board3\portal\controller\helper $controller_helper Board3 Portal controller helper
* @param \board3\portal\portal\columns $portal_columns Portal columns helper * @param \board3\portal\portal\columns $portal_columns Portal columns helper
* @param \board3\portal\includes\helper $portal_helper Portal helper * @param \board3\portal\includes\helper $portal_helper Portal helper
* @param \board3\portal\portal\modules\constraints_handler $constraints_handler Modules constraints handler * @param \board3\portal\portal\modules\constraints_handler $constraints_handler Modules constraints handler
@@ -62,10 +66,11 @@ class manager
* @param \phpbb\request\request_interface $request phpBB request * @param \phpbb\request\request_interface $request phpBB request
* @param \phpbb\user $user phpBB user * @param \phpbb\user $user phpBB user
*/ */
public function __construct($cache, driver_interface $db, columns $portal_columns, helper $portal_helper, constraints_handler $constraints_handler, database_handler $database_handler, request_interface $request, $user) public function __construct($cache, driver_interface $db, \board3\portal\controller\helper $controller_helper, columns $portal_columns, helper $portal_helper, constraints_handler $constraints_handler, database_handler $database_handler, request_interface $request, $user)
{ {
$this->cache = $cache; $this->cache = $cache;
$this->db = $db; $this->db = $db;
$this->controller_helper = $controller_helper;
$this->portal_columns = $portal_columns; $this->portal_columns = $portal_columns;
$this->portal_helper = $portal_helper; $this->portal_helper = $portal_helper;
$this->constraints_handler = $constraints_handler; $this->constraints_handler = $constraints_handler;
@@ -362,7 +367,7 @@ class manager
{ {
if ($this->module->get_language()) if ($this->module->get_language())
{ {
$this->user->add_lang_ext('board3/portal', 'modules/' . $this->module->get_language()); $this->controller_helper->load_module_language($this->module);
} }
$confirm_text = (isset($this->user->lang[$module_data['module_name']])) ? sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], $this->user->lang[$module_data['module_name']]) : sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], utf8_normalize_nfc($module_data['module_name'])); $confirm_text = (isset($this->user->lang[$module_data['module_name']])) ? sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], $this->user->lang[$module_data['module_name']]) : sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], utf8_normalize_nfc($module_data['module_name']));
confirm_box(false, $confirm_text, build_hidden_fields(array( confirm_box(false, $confirm_text, build_hidden_fields(array(