diff --git a/Cake/I18n/L10n.php b/Cake/I18n/L10n.php index d002499b13b..53f5607da05 100644 --- a/Cake/I18n/L10n.php +++ b/Cake/I18n/L10n.php @@ -340,9 +340,6 @@ class L10n { public function __construct(Request $request) { $this->_request = $request; - if (defined('DEFAULT_LANGUAGE')) { - $this->default = DEFAULT_LANGUAGE; - } $default = Configure::read('Config.language'); if ($default) { $this->default = $default; diff --git a/Cake/Test/TestCase/I18n/L10nTest.php b/Cake/Test/TestCase/I18n/L10nTest.php index 0d0c08bbe66..b81f0cd55f3 100644 --- a/Cake/Test/TestCase/I18n/L10nTest.php +++ b/Cake/Test/TestCase/I18n/L10nTest.php @@ -121,34 +121,6 @@ public function testGetAutoLanguage() { $this->assertEquals('eng', $localize->locale); } -/** - * testGet method with deprecated constant DEFAULT_LANGUAGE - * - * @return void - */ - public function testGetWithDeprecatedConstant() { - $this->skipIf(defined('DEFAULT_LANGUAGE'), 'Cannot re-define already defined constant.'); - - define('DEFAULT_LANGUAGE', 'en-us'); - $localize = new L10n($this->request); - - $lang = $localize->get('use_default'); - - $this->assertEquals('en-us', $lang); - $this->assertEquals('English (United States)', $localize->language); - $this->assertEquals(array('en_us', 'eng'), $localize->languagePath); - $this->assertEquals('en_us', $localize->locale); - - $localize = new L10n($this->request); - - $lang = $localize->get(); - - $this->assertEquals('en-us', $lang); - $this->assertEquals('English (United States)', $localize->language); - $this->assertEquals(array('en_us', 'eng'), $localize->languagePath); - $this->assertEquals('en_us', $localize->locale); - } - /** * testMap method *