Fix #12442: Add ability to request any translation of a string #12443
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pmac
force-pushed
the
fluent-english-strings
branch
from
c7b9a81 to
fa0430a
Compare
Codecov ReportBase: 77.38% // Head: 77.52% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## main #12443 +/- ##
==========================================
+ Coverage 77.38% 77.52% +0.13%
==========================================
Files 147 147
Lines 7826 7834 +8
==========================================
+ Hits 6056 6073 +17
+ Misses 1770 1761 -9
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
stevejalim
approved these changes
Dec 7, 2022
| @@ -46,6 +46,8 @@ def render_to_string(template_name, context=None, request=None, using=None, ftl_ | |||
| context["fluent_l10n"] = fluent_l10n([locale, "en"], ftl_files) | |||
| else: | |||
| context["fluent_l10n"] = fluent_l10n([locale, "en"], settings.FLUENT_DEFAULT_FILES) | |||
|
|
|||
| context["fluent_files"] = ftl_files or settings.FLUENT_DEFAULT_FILES | |||
There was a problem hiding this comment.
Worth a comment here to disambiguate fluent_l10n from fluent_files?
| @@ -128,8 +130,7 @@ def render(request, template, context=None, ftl_files=None, activation_files=Non | |||
| else: | |||
| context["fluent_l10n"] = fluent_l10n([locale, "en"], settings.FLUENT_DEFAULT_FILES) | |||
|
|
|||
| # Every template gets its own .lang file, so figure out what it is | |||
| # and pass it in the context | |||
| context["fluent_files"] = ftl_files or settings.FLUENT_DEFAULT_FILES | |||
There was a problem hiding this comment.
Worth a comment here to disambiguate fluent_l10n from fluent_files?
| @@ -145,7 +145,10 @@ def inner(*args, **kwargs): | |||
| # can not use += here because that mutates the original list | |||
| ftl_files = ftl_files + settings.FLUENT_DEFAULT_FILES | |||
| locale = kwargs.get("locale") or translation.get_language(True) | |||
| l10n = fluent_l10n([locale, "en"], ftl_files) | |||
| locales = [locale] | |||
| if locale != "en": | |||
There was a problem hiding this comment.
Suggested change
| if locale != "en": | |
| # If we're forcing use of `en`, make sure it's in `locales`, but only once | |
| if locale != "en": |
robhudson
reviewed
Dec 7, 2022
| req = self.rf.get("/en-US/") | ||
| req.locale = "en-US" | ||
| result = render_to_string("test-fr-title.html", request=req, ftl_files="mozorg/fluent") | ||
| assert result.strip() == "This is a test of the new Fluent L10n system:Title in French" |
robhudson
approved these changes
Dec 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.