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

[ticket/12254] Better language switching on registration page

Browse source 
PHPBB3-12254
This commit is contained in:
Matt Friedman 2014-04-06 23:55:46 -07:00
parent d0aa7c6455
commit 41b0b8c5f9
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/ucp/ucp_register.php
View file

@ -65,7 +65,6 @@ class ucp_register
} }
$user->lang_name = $user_lang = $use_lang; $user->lang_name = $user_lang = $use_lang;
$user->lang = array();
$user->data['user_lang'] = $user->lang_name; $user->data['user_lang'] = $user->lang_name;
$user->add_lang(array('common', 'ucp')); $user->add_lang(array('common', 'ucp'));
} }

16
phpBB/phpbb/user.php
View file

@ -79,8 +79,22 @@ class user extends \phpbb\session
$user_timezone = $this->data['user_timezone']; $user_timezone = $this->data['user_timezone'];
} }
else else
{
$change_lang = request_var('change_lang', '');
if ($change_lang)
{
global $SID, $_EXTRA_URL;
$use_lang = basename($change_lang);
$user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']);
$this->data['user_lang'] = $user_lang_name;
$SID .= '&change_lang=' . $user_lang_name;
$_EXTRA_URL[] = 'change_lang=' . $user_lang_name;
}
else
{ {
$user_lang_name = basename($config['default_lang']); $user_lang_name = basename($config['default_lang']);
}
$user_date_format = $config['default_dateformat']; $user_date_format = $config['default_dateformat'];
$user_timezone = $config['board_timezone']; $user_timezone = $config['board_timezone'];
@ -189,7 +203,7 @@ class user extends \phpbb\session
$style_id = $style_request; $style_id = $style_request;
$SID .= '&style=' . $style_id; $SID .= '&style=' . $style_id;
$_EXTRA_URL = array('style=' . $style_id); $_EXTRA_URL[] = 'style=' . $style_id;
} }
else else
{ {