Making DEFAULT_LANGUAGE also set $language var which sets Config.lang…

…uage to a correct value. Fixes #228
cakephp · Jan 20, 2010 · ae4a31f · ae4a31f
1 parent 96fd0bf
commit ae4a31f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
@@ -352,7 +352,7 @@ function __setLanguage($language = null) {
 		} else if ($language !== null && isset($this->__l10nCatalog[$language])) {
 			$langKey = $language;
 		} else if (defined('DEFAULT_LANGUAGE')) {
-			$langKey = DEFAULT_LANGUAGE;
+			$langKey = $language = DEFAULT_LANGUAGE;
 		}
 
 		if ($langKey !== null && isset($this->__l10nCatalog[$langKey])) {

diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
@@ -99,6 +99,11 @@ function testGet() {
 		$expected = 'en_us';
 		$this->assertEqual($result, $expected);
 
+		$l10n->get('es');
+		$l10n->get('');
+		$this->assertEqual($l10n->lang, 'en-us');
+
+
 		// Using $this->default
 		$l10n = new L10n();
 		$l10n->get('use_default');