From 09d3a0626a77e8ca1a71eee870c430ffc2be79ce Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 7 Nov 2010 01:38:25 -0400 Subject: [PATCH] Updating l10n to use the new CakeRequest method. --- cake/libs/l10n.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php index 816bf212c..4f5868412 100644 --- a/cake/libs/l10n.php +++ b/cake/libs/l10n.php @@ -17,6 +17,7 @@ * @since CakePHP(tm) v 1.2.0.4116 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::import('Core', 'CakeRequest'); /** * Localization @@ -407,13 +408,8 @@ class L10n { * @access private */ function __autoLanguage() { - $_detectableLanguages = preg_split('/[,;]/', env('HTTP_ACCEPT_LANGUAGE')); + $_detectableLanguages = CakeRequest::acceptLanguage(); foreach ($_detectableLanguages as $key => $langKey) { - $langKey = strtolower($langKey); - if (strpos($langKey, '_') !== false) { - $langKey = str_replace('_', '-', $langKey); - } - if (isset($this->__l10nCatalog[$langKey])) { $this->__setLanguage($langKey); return true;