Removed deprecated constant DEFAULT_LANGUAGE.

cakephp · Nov 15, 2013 · 2c9503d · 2c9503d
1 parent 66bb78b
commit 2c9503d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 31 deletions.
diff --git 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
@@ -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
  *