diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-17 15:36:19 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-17 15:36:19 +0200 |
| commit | a928b109d39b2c481b8de13d5790ec68190abab5 (patch) | |
| tree | 19a3e3367fc11c93ee996ba70d552998498c0811 /phpBB | |
| parent | 7d4bbeef3fcad3379104007acad86239cb67fb44 (diff) | |
| parent | 22b9f35bdfd878d74536f26bc5dc249255b05480 (diff) | |
| download | forums-a928b109d39b2c481b8de13d5790ec68190abab5.tar forums-a928b109d39b2c481b8de13d5790ec68190abab5.tar.gz forums-a928b109d39b2c481b8de13d5790ec68190abab5.tar.bz2 forums-a928b109d39b2c481b8de13d5790ec68190abab5.tar.xz forums-a928b109d39b2c481b8de13d5790ec68190abab5.zip | |
Merge pull request #3990 from CHItA/ticket/13371
[ticket/13371] Fix language loading for the old installer
* CHItA/ticket/13371:
[ticket/13371] Add language files to the service as well
[ticket/13371] Use user selected language in old installer
[ticket/13371] Fix language loading for the old installer
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/index.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 6320b14947..a578e664cd 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -243,6 +243,8 @@ $sub = $request->variable('sub', ''); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); $lang_service = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); +$lang_service->add_lang($load_lang_files); +$lang_service->set_user_language($language); $user = new \phpbb\user($lang_service, '\phpbb\datetime'); $auth = new \phpbb\auth\auth(); @@ -303,6 +305,11 @@ $template = new \phpbb\template\twig\twig( array($phpbb_container->get('template.twig.extensions.phpbb')) ); +/** @var \phpbb\language\language $lang_service */ +$lang_service = $phpbb_container->get('language'); +$lang_service->add_lang($load_lang_files); +$lang_service->set_user_language($language); + $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array_filter($paths, 'is_dir'); $template->set_custom_style(array( |