Skip to content
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

Jump to bottom

[Translation] prefer intl domain when adding messages to catalogue #35370

Closed
wants to merge 6 commits into from
Closed

[Translation] prefer intl domain when adding messages to catalogue #35370

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4eefc31
prefer intl message domain
Guite Jan 17, 2020
c196575
updated the fix
Guite Jan 17, 2020
8ec41c0
updated the fix
Guite Jan 17, 2020
232bc56
fix remaining tests
Guite Jan 17, 2020
f659286
catch edge case if existing key has no value
Guite Jan 17, 2020
77fcb80
cs
Guite Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/Symfony/Component/Translation/MessageCatalogue.php
View file
Open in desktop
Expand Up @@ -154,9 +154,16 @@ public function replace(array $messages, string $domain = 'messages')
public function add(array $messages, string $domain = 'messages')
{
if (!isset($this->messages[$domain])) {
$this->messages[$domain] = $messages;
} else {
foreach ($messages as $id => $message) {
$this->messages[$domain] = [];
}
$intlDomain = $domain;
if (false === mb_strpos($intlDomain, self::INTL_DOMAIN_SUFFIX)) {
$intlDomain .= self::INTL_DOMAIN_SUFFIX;
}
foreach ($messages as $id => $message) {
if (isset($this->messages[$intlDomain]) && \array_key_exists($id, $this->messages[$intlDomain])) {
$this->messages[$intlDomain][$id] = $message;
} else {
$this->messages[$domain][$id] = $message;
}
}
Expand Down