fixed error caused by the fallback implementation of gettext #2586
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
LeXofLeviafan
commented
Dec 26, 2024
| @@ -4,11 +4,11 @@ | |||
| except ImportError: | |||
|
|
|||
| def gettext(string, **variables): | |||
| return string % variables | |||
| return string if not variables else string % variables | |||
There was a problem hiding this comment.
This is based directly on flask-babel implementation.
LeXofLeviafan
commented
Dec 26, 2024
|
Do you have a reproduction example or a test case we could add? |
|
Server code during app init (to enable app-level translations in templates): app.jinja_env.add_extension('jinja2.ext.i18n')
app.jinja_env.install_gettext_callables(gettext, ngettext, newstyle=True)If the {{ _('foo %(bar)s baz', bar='<code>bar</code>'|safe) }} {# usecase: injecting HTML into text #}As mentioned in the PR description, trying to debug the error reveals that when |
samuelhwilliams
approved these changes
Jan 1, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Turns out that when used with keywords in templates,
gettext()gets invoked by Jinja without keyword params (guess they're applied to the returned string instead). Thus, the current fallback implementation causes an error in such a case.