github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r316

Browse source 
Автоматическое определение языка для гостей git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@316 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
fly.dvorkin 2011-11-14 22:29:24 +00:00
commit c31c70491b
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
upload/config.php
View file

@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.2 Beta'; $bb_cfg['tp_version'] = '2.2 Beta';
$bb_cfg['tp_release_state'] = 'R314'; $bb_cfg['tp_release_state'] = 'R316';
$bb_cfg['tp_release_date'] = '13-11-2011'; $bb_cfg['tp_release_date'] = '15-11-2011';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';
@ -229,7 +229,25 @@ define('TRIGGERS_DIR', BB_PATH .'/triggers/' );
// Language // Language
setlocale(LC_ALL, 'ru_RU.UTF-8'); setlocale(LC_ALL, 'ru_RU.UTF-8');
setlocale(LC_NUMERIC, 'C'); setlocale(LC_NUMERIC, 'C');
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'lang_russian/'; $bb_cfg['auto_language'] = true;
if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language'])
{
if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ru')
{
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'lang_russian/';
$bb_cfg['default_lang'] = 'russian';
}
else
{
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'lang_english/';
$bb_cfg['default_lang'] = 'english';
}
}
else
{
if ($bb_cfg['default_lang'] == 'russian') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'lang_russian/';
else $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'lang_english/';
}
// Templates // Templates
define('ADMIN_TPL_DIR', TEMPLATES_DIR .'/admin/'); define('ADMIN_TPL_DIR', TEMPLATES_DIR .'/admin/');

2
upload/includes/page_footer.php
View file

@ -109,7 +109,7 @@ if (defined('REQUESTED_PAGE') && !defined('DISABLE_CACHING_OUTPUT'))
{ {
if (IS_GUEST === true) if (IS_GUEST === true)
{ {
caching_output(true, 'store', REQUESTED_PAGE .'_guest'); caching_output(true, 'store', REQUESTED_PAGE .'_guest_'. $bb_cfg['default_lang']);
} }
} }

2
upload/index.php
View file

@ -35,7 +35,7 @@ $req_page = 'index_page';
$req_page .= ($viewcat) ? "_c{$viewcat}" : ''; $req_page .= ($viewcat) ? "_c{$viewcat}" : '';
define('REQUESTED_PAGE', $req_page); define('REQUESTED_PAGE', $req_page);
caching_output(IS_GUEST, 'send', REQUESTED_PAGE .'_guest'); caching_output(IS_GUEST, 'send', REQUESTED_PAGE .'_guest_'. $bb_cfg['default_lang']);
$hide_cat_opt = isset($user->opt_js['h_cat']) ? (string) $user->opt_js['h_cat'] : 0; $hide_cat_opt = isset($user->opt_js['h_cat']) ? (string) $user->opt_js['h_cat'] : 0;
$hide_cat_user = array_flip(explode('-', $hide_cat_opt)); $hide_cat_user = array_flip(explode('-', $hide_cat_opt));