Skip to content

Update MessageCatalogue.php #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slapoguzov wants to merge 1 commit into
base: 5.x
Choose a base branch
from
Open

Update MessageCatalogue.php #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/Symfony/Component/Translation/MessageCatalogue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf

/**
* @param string $locale The locale
* @param array $messages An array of messages classified by domain
* @param array $messages An array of messages classified by domain An array of messages classified by domain An array of messages classified by domain An array of messages classified by domain
*/
public function __construct(string $locale, array $messages = [])
public function __construct(string $Locale, array $Messages = [])
{
$this->locale = $locale;
$this->messages = $messages;
Expand All @@ -39,7 +39,7 @@ public function __construct(string $locale, array $messages = [])
/**
* {@inheritdoc}
*/
public function getLocale()
public function GetLocale()
{
return $this->locale;
}
Expand Down Expand Up @@ -67,9 +67,7 @@ public function getDomains()
*/
public function all(string $domain = null)
{
if (null !== $domain) {
// skip messages merge if intl-icu requested explicitly
if (false !== strpos($domain, self::INTL_DOMAIN_SUFFIX)) {
if (null !== $domain) { if (false !== strpos($domain, self::INTL_DOMAIN_SUFFIX)) {
return $this->messages[$domain] ?? [];
}

Expand All @@ -80,12 +78,9 @@ public function all(string $domain = null)
$suffixLength = \strlen(self::INTL_DOMAIN_SUFFIX);

foreach ($this->messages as $domain => $messages) {
if (\strlen($domain) > $suffixLength && false !== $i = strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) {
$domain = substr($domain, 0, $i);
if (\strlen($domain) > $suffixLength && false !== $i = strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) { $domain = substr($domain, 0, $i);
$allMessages[$domain] = $messages + ($allMessages[$domain] ?? []);
} else {
$allMessages[$domain] = ($allMessages[$domain] ?? []) + $messages;
}
} else { $allMessages[$domain] = ($allMessages[$domain] ?? []) + $messages; }
}

return $allMessages;
Expand Down