From c31c70491b208cff743f01d04b5b9e7e758b61a1 Mon Sep 17 00:00:00 2001
From: "fly.dvorkin" <fly.dvorkin@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 14 Nov 2011 22:29:24 +0000
Subject: [PATCH] r316
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Автоматическое определение языка для гостей git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@316 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php               | 24 +++++++++++++++++++++---
 upload/includes/page_footer.php |  2 +-
 upload/index.php                |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 60663a9a2..00470a55f 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.2 Beta';
-$bb_cfg['tp_release_state'] = 'R314';
-$bb_cfg['tp_release_date'] = '13-11-2011';
+$bb_cfg['tp_release_state'] = 'R316';
+$bb_cfg['tp_release_date'] = '15-11-2011';
 
 // Database
 $charset  = 'utf8';
@@ -229,7 +229,25 @@ define('TRIGGERS_DIR',  BB_PATH .'/triggers/' );
 // Language
 setlocale(LC_ALL, 'ru_RU.UTF-8');
 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
 define('ADMIN_TPL_DIR', TEMPLATES_DIR .'/admin/');
diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php
index 1106cf51c..5937c032c 100644
--- a/upload/includes/page_footer.php
+++ b/upload/includes/page_footer.php
@@ -109,7 +109,7 @@ if (defined('REQUESTED_PAGE') && !defined('DISABLE_CACHING_OUTPUT'))
 {
 	if (IS_GUEST === true)
 	{
-		caching_output(true, 'store', REQUESTED_PAGE .'_guest');
+		caching_output(true, 'store', REQUESTED_PAGE .'_guest_'. $bb_cfg['default_lang']);
 	}
 }
 
diff --git a/upload/index.php b/upload/index.php
index 233d971ab..f2726eb59 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -35,7 +35,7 @@ $req_page = 'index_page';
 $req_page .= ($viewcat) ? "_c{$viewcat}" : '';
 
 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_user = array_flip(explode('-', $hide_cat_opt));