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

[Translator] coding style

Browse Source
This commit is contained in:
Tobias Schultze 2013-02-13 01:53:15 +01:00
parent a4ac5e6374
commit d1c34e87cb
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/Translation/MessageCatalogue.php
View File

@ -24,8 +24,8 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
{ {
private $messages = array(); private $messages = array();
private $metadata = array(); private $metadata = array();
private $resources = array();
private $locale; private $locale;
private $resources;
private $fallbackCatalogue; private $fallbackCatalogue;
private $parent; private $parent;
@ -41,7 +41,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
{ {
$this->locale = $locale; $this->locale = $locale;
$this->messages = $messages; $this->messages = $messages;
$this->resources = array();
} }
/** /**

12
src/Symfony/Component/Translation/Translator.php
View File

@ -56,15 +56,15 @@ class Translator implements TranslatorInterface
/** /**
* Constructor. * Constructor.
* *
* @param string $locale The locale * @param string $locale The locale
* @param MessageSelector $selector The message selector for pluralization * @param MessageSelector|null $selector The message selector for pluralization
* *
* @api * @api
*/ */
public function __construct($locale, MessageSelector $selector = null) public function __construct($locale, MessageSelector $selector = null)
{ {
$this->locale = $locale; $this->locale = $locale;
$this->selector = null === $selector ? new MessageSelector() : $selector; $this->selector = $selector ?: new MessageSelector();
} }
/** /**
@ -129,7 +129,7 @@ class Translator implements TranslatorInterface
// needed as the fallback locales are linked to the already loaded catalogues // needed as the fallback locales are linked to the already loaded catalogues
$this->catalogues = array(); $this->catalogues = array();
$this->fallbackLocales = is_array($locales) ? $locales : array($locales); $this->fallbackLocales = (array) $locales;
} }
/** /**
@ -139,7 +139,7 @@ class Translator implements TranslatorInterface
*/ */
public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null) public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null)
{ {
if (!isset($locale)) { if (null === $locale) {
$locale = $this->getLocale(); $locale = $this->getLocale();
} }
@ -157,7 +157,7 @@ class Translator implements TranslatorInterface
*/ */
public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null) public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
{ {
if (!isset($locale)) { if (null === $locale) {
$locale = $this->getLocale(); $locale = $this->getLocale();
} }