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

Prevent translation files overwriting files from addResource calls #320

Merged
merged 2 commits into from
Jul 5, 2021

Conversation

carakas
Copy link
Contributor

@carakas carakas commented Jul 2, 2021

array_merge with replace the translations that are in there while array_merge_recursive will append them. That way you don't loose translation sources.

@monteiro
Copy link
Collaborator

monteiro commented Jul 3, 2021

Thanks for the PR @carakas,
Tests are failing for some reason (not your PR).

Going to try to fix it.

@monteiro
Copy link
Collaborator

monteiro commented Jul 3, 2021

@carakas can you rebase, so we can see if all tests are green? Thanks!

I have fixed the tests here

@monteiro
Copy link
Collaborator

monteiro commented Jul 4, 2021

It's green. I will release next week if everything is fine.

@monteiro monteiro merged commit 279a67f into willdurand:master Jul 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants