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

Use trans() for proper locale fallback when using CDN languages #141

Merged
merged 2 commits into from
Jun 29, 2020

Conversation

freezy-sk
Copy link
Contributor

@jkabat mentioned in #136 that he uses fr_FR as locale. this update should fix this issue when cdn language is configured with supported locale, but used with defined region

@curry684 curry684 requested a review from shades684 March 13, 2020 09:19
@curry684
Copy link
Member

This makes sense I think, but doesn't this also require an update to https://github.com/omines/datatables-bundle/blob/master/bin/update-translations to avoid it removing the file properties next time it's run?

@freezy-sk
Copy link
Contributor Author

@curry684 there's no need to update that script, because file property is in own file DataTablesCDN.{locale}.yml

@curry684
Copy link
Member

@shades684 whatcha think?

@curry684
Copy link
Member

curry684 commented Apr 1, 2020

@freezy-sk could you check why it breaks all tests? Master branch is passing right now (don't think it was when you started this).

@freezy-sk
Copy link
Contributor Author

@curry684 I squashed and rebased but it's still failing on ocramius/package-versions

@curry684
Copy link
Member

curry684 commented Apr 2, 2020

Yep, started breaking again in master as well 😕

@curry684
Copy link
Member

👍

@curry684 curry684 merged commit 92a06d6 into omines:master Jun 29, 2020
@freezy-sk freezy-sk deleted the cdn branch June 30, 2020 07:22
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