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.

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

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

Merged
merged 1 commit into from Feb 3, 2020
Merged

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

merged 1 commit into from Feb 3, 2020

Conversation

Guite
Copy link
Contributor

@Guite Guite commented Jan 22, 2020

Q A
Branch? 4.4
Bug fix? yes
New feature? no
Deprecations? no
Tickets
License MIT
Doc PR

This PR ensures that when adding translations to a catalogue using the add(array $messages, string $domain = 'messages') method internally the intl icu domain is checked first.

Otherwise it could happen that existing messages in e.g. messages+intl-icu are not updated but the same keys are added to messages.

This is a follow-up of #35370, now targeting the 4.4 branch.

@Guite
Copy link
Contributor Author

Guite commented Jan 22, 2020

@welcoMattic @nicolas-grekas targets 4.4 now and added a test case

@fabpot
Copy link
Member

fabpot commented Feb 3, 2020

Thank you @Guite.

fabpot added a commit that referenced this pull request Feb 3, 2020
…atalogue (Guite)

This PR was squashed before being merged into the 4.4 branch (closes #35430).

Discussion
----------

[Translation] prefer intl domain when adding messages to catalogue

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

This PR ensures that when adding translations to a catalogue using the `add(array $messages, string $domain = 'messages')` method internally the intl icu domain is checked first.

Otherwise it could happen that existing messages in e.g. `messages+intl-icu` are not updated but the same keys are added to `messages`.

This is a follow-up of #35370, now targeting the `4.4` branch.

Commits
-------

b72b7d3 [Translation] prefer intl domain when adding messages to catalogue
@fabpot fabpot merged commit b72b7d3 into symfony:4.4 Feb 3, 2020
This was referenced Feb 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants