Cleanup and fix loading of translations.#3836
Open
htgoebel wants to merge 1 commit intogetnikola:masterfrom
Open
Cleanup and fix loading of translations.#3836htgoebel wants to merge 1 commit intogetnikola:masterfrom
htgoebel wants to merge 1 commit intogetnikola:masterfrom
Conversation
htgoebel
force-pushed
the
rework-translation-load
branch
from
6d6850e to
8dfbadd
Compare
The new code clearly distinguishes between loading default translations from the "base" theme and loading (additional) translations from the (inherited) themes. Also the former method put the directories onto sys.path and imported the translation files as modules. This not only keeps the whole module in memory (which might be neglectable nowadays) but also requires extra code to reload the module for each theme. The new method loads the file and executes it using exec(). As a side-effect, this also fixed the bug that translations provided by the "base" theme got lost if another theme provided additional message strings.
htgoebel
force-pushed
the
rework-translation-load
branch
from
8dfbadd to
9f0d76e
Compare
Kwpolska
requested changes
Mar 23, 2025
| msg_folder = Path(get_theme_path(theme_name)) / 'messages' | ||
| # load English default from this theme | ||
| english = load_msgs('en', msg_folder) | ||
| messages[lang].update(english) # FIXME: This will overwrite translated strings |
Member
There was a problem hiding this comment.
That’s not acceptable, please fix that.
Contributor
Author
There was a problem hiding this comment.
Will do. This is just what the former code did, AFAUI.
| completion_status[lang] = True | ||
|
|
||
| if not all(found.values()): | ||
| print(lang, last_exception) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Pull Request Checklist
Description
Closes #3835
The new code clearly distinguishes between loading default translations from the "base" theme and loading (additional) translations from the (inherited) themes.
Also the former method put the directories onto sys.path and imported the translation files as modules. This not only keeps the whole module in memory (which might be neglectable nowadays) but also requires extra code to reload the module for each theme. The new method loads the file and executes it using exec().
As a side-effect, this also fixed the bug that translations provided by the "base" theme got lost if another theme provided additional message strings. See #3835.
Output from the tests shown in #3835: