adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure L10n::get() consistently returns the set language. Closes #2737

Browse source
This commit is contained in:
ADmad 2012-04-09 00:49:24 +05:30
parent 35b48c2c8c
commit 1949a20b5a
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/I18n/L10n.php
View file

@ -343,9 +343,12 @@ class L10n {
public function get($language = null) { public function get($language = null) {
if ($language !== null) { if ($language !== null) {
return $this->_setLanguage($language); return $this->_setLanguage($language);
} elseif ($this->_autoLanguage() === false) {
return $this->_setLanguage();
} }
if (!$this->_autoLanguage()) {
$this->_setLanguage();
}
return $this->lang;
} }
/** /**

12
lib/Cake/Test/Case/I18n/L10nTest.php
View file

@ -34,8 +34,9 @@ class L10nTest extends CakeTestCase {
$localize = new L10n(); $localize = new L10n();
// Catalog Entry // Catalog Entry
$localize->get('en'); $lang = $localize->get('en');
$this->assertEquals('en', $lang);
$this->assertEquals('English', $localize->language); $this->assertEquals('English', $localize->language);
$this->assertEquals(array('eng', 'eng'), $localize->languagePath); $this->assertEquals(array('eng', 'eng'), $localize->languagePath);
$this->assertEquals('eng', $localize->locale); $this->assertEquals('eng', $localize->locale);
@ -57,8 +58,9 @@ class L10nTest extends CakeTestCase {
// Default Entry // Default Entry
define('DEFAULT_LANGUAGE', 'en-us'); define('DEFAULT_LANGUAGE', 'en-us');
$localize->get('use_default'); $lang = $localize->get('use_default');
$this->assertEquals('en-us', $lang);
$this->assertEquals('English (United States)', $localize->language); $this->assertEquals('English (United States)', $localize->language);
$this->assertEquals(array('en_us', 'eng'), $localize->languagePath); $this->assertEquals(array('en_us', 'eng'), $localize->languagePath);
$this->assertEquals('en_us', $localize->locale); $this->assertEquals('en_us', $localize->locale);
@ -86,15 +88,17 @@ class L10nTest extends CakeTestCase {
$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'inexistent,en-ca'; $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'inexistent,en-ca';
$localize = new L10n(); $localize = new L10n();
$localize->get(); $lang = $localize->get();
$this->assertEquals('en-ca', $lang);
$this->assertEquals('English (Canadian)', $localize->language); $this->assertEquals('English (Canadian)', $localize->language);
$this->assertEquals(array('en_ca', 'eng', 'eng'), $localize->languagePath); $this->assertEquals(array('en_ca', 'eng', 'eng'), $localize->languagePath);
$this->assertEquals('en_ca', $localize->locale); $this->assertEquals('en_ca', $localize->locale);
$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es_mx'; $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es_mx';
$localize->get(); $lang = $localize->get();
$this->assertEquals('es-mx', $lang);
$this->assertEquals('Spanish (Mexican)', $localize->language); $this->assertEquals('Spanish (Mexican)', $localize->language);
$this->assertEquals(array('es_mx', 'spa', 'eng'), $localize->languagePath); $this->assertEquals(array('es_mx', 'spa', 'eng'), $localize->languagePath);
$this->assertEquals('es_mx', $localize->locale); $this->assertEquals('es_mx', $localize->locale);