diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Session] Used \Locale::setDefault() when the locale is setted

Browse Source
This commit is contained in:
Francis Besset 2011-04-28 00:03:32 +02:00
parent 289d35a7ae
commit 72c074a101
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/HttpFoundation/Session.php
View File

@ -37,6 +37,7 @@ class Session implements \Serializable
$this->storage = $storage;
$this->defaultLocale = $defaultLocale;
$this->attributes = array('_flash' => array(), '_locale' => $this->getDefaultLocale());
\Locale::setDefault($this->attributes['_locale']);
$this->started = false;
}
@ -61,6 +62,8 @@ class Session implements \Serializable
$this->attributes['_locale'] = $this->getDefaultLocale();
}
\Locale::setDefault($this->attributes['_locale']);
// flag current flash messages to be removed at shutdown
$this->oldFlashes = array_flip(array_keys($this->attributes['_flash']));
@ -104,7 +107,11 @@ class Session implements \Serializable
$this->start();
}
$this->attributes[$name] = $value;
if ('_locale' === $name) {
$this->setLocale($value);
} else {
$this->attributes[$name] = $value;
}
}
/**
@ -128,6 +135,10 @@ class Session implements \Serializable
$this->start();
}
if (isset($attributes['_locale'])) {
$this->setLocale($attributes['_locale']);
}
$this->attributes = $attributes;
}
@ -208,7 +219,7 @@ class Session implements \Serializable
$this->start();
}
$this->attributes['_locale'] = $locale;
\Locale::setDefault($this->attributes['_locale'] = $locale);
}
public function getFlashes()
@ -278,6 +289,7 @@ class Session implements \Serializable
if (isset($this->attributes['_flash'])) {
$this->attributes['_flash'] = array_diff_key($this->attributes['_flash'], $this->oldFlashes);
}
$this->storage->write('_symfony2', $this->attributes);
}

11
tests/Symfony/Tests/Component/HttpFoundation/SessionTest.php
View File

@ -162,14 +162,20 @@ class SessionTest extends \PHPUnit_Framework_TestCase
public function testLocale()
{
$this->assertSame('en', $this->session->getLocale(), 'default locale is en');
$this->assertSame('en', \Locale::getDefault(), '\Locale::getDefault() is en');
$this->session->set('_locale','de');
$this->assertSame('de', $this->session->getLocale(), 'locale is de');
$this->assertSame('de', \Locale::getDefault(), '\Locale::getDefault() is de');
$this->session = $this->getSession();
$this->session->setLocale('fr');
$this->assertSame('fr', $this->session->getLocale(), 'locale is fr');
$this->assertSame('fr', \Locale::getDefault(), '\Locale::getDefault() is fr');
$this->session->setAttributes(array('_locale' => 'de'));
$this->assertSame('de', $this->session->getLocale(), 'locale is de');
$this->assertSame('de', \Locale::getDefault(), '\Locale::getDefault() is de');
}
public function testGetId()
@ -182,11 +188,14 @@ class SessionTest extends \PHPUnit_Framework_TestCase
$this->session->start();
$this->assertSame('en', $this->session->getLocale());
$this->assertSame('en', \Locale::getDefault());
$this->assertSame(array(), $this->session->getFlashes());
$this->assertSame(array('_flash' => array(), '_locale' => 'en'), $this->session->getAttributes());
$this->session->start();
$this->assertSame('en', $this->session->getLocale());
$this->assertSame('en', \Locale::getDefault());
}
protected function getSession()