Merge pull request #3275 from kimse1/accept-language-disable

Added option to turn Accept-language on/off
pyrocms · May 6, 2014 · c1f5043 · c1f5043
2 parents 00712ab + a20a633
commit c1f5043
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 201 deletions.
diff --git a/system/cms/config/language.php b/system/cms/config/language.php
@@ -211,3 +211,16 @@
 |
 */
 $config['default_language'] = 'en';
+
+/*
+|--------------------------------------------------------------------------
+| Detect language using Accept-Language
+|--------------------------------------------------------------------------
+|
+| Whether or not to take into account the Accept-Language client header
+|
+| Only turn it on for admin panel:
+| 	$config['check_http_accept_language'] = (bool) preg_match('@\/admin(\/.+)?$@', $_SERVER['REQUEST_URI']);
+|
+*/
+$config['check_http_accept_language'] = TRUE;
diff --git a/system/cms/config/language.php.orig b/system/cms/config/language.php.orig
diff --git a/system/cms/hooks/pick_language.php b/system/cms/hooks/pick_language.php
@@ -57,7 +57,7 @@ function pick_language()
 	}
 
 	// Still no Lang. Lets try some browser detection then
-	elseif ( ! empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+	elseif ( $config['check_http_accept_language'] and ! empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 	{
 		// explode languages into array
 		$accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
@@ -117,4 +117,4 @@ function pick_language()
 	define('AUTO_LANGUAGE', $lang);
 
 	log_message('debug', 'Defined const AUTO_LANGUAGE: '.AUTO_LANGUAGE);
-}
+}