fix: General fixing and clean-up on translate()
#1364
Draft
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
This pull request summarizes several problems: 1. Let all ViUR-core related translations have a `viur.core`-tr_key-prefix 2. Make `tr_key` required 3. Provide a way for `conf.i18n.add_missing_translations` to only add or ingore a specific pattern (fnmatch)
phorward
added
bug(fix)
phorward
commented
Jan 9, 2025
src/viur/core/i18n.py
Outdated
Comment on lines
209
to
210
| not self.key.startswith("core.") | ||
| and not self.key.startswith("viur.") |
phorward
commented
Jan 9, 2025
src/viur/core/bones/select.py
Outdated
Comment on lines
95
to
106
| if self.languages: | ||
| prefix = self.translation_key_prefix | ||
| if callable(prefix): | ||
| prefix = prefix(self) | ||
|
|
||
| values = { | ||
| key: label if isinstance(label, translate) else translate( | ||
| f"{prefix}{label}", str(label), | ||
| f"value {key} for {self.name}<{type(self).__name__}> in {self.skel_cls.__name__} in {self.skel_cls}" | ||
| ) | ||
| for key, label in values.items() | ||
| } |
phorward
commented
Jan 9, 2025
| @@ -21,25 +21,29 @@ class TranslationSkel(Skeleton): | |||
| kindName = KINDNAME | |||
|
|
|||
| tr_key = StringBone( | |||
| required=True, | |||
- SelectBone now allowes for a separate `add_missing_translations`-parameter - `conf.i18n.add_missing_translations` can now be also an iterable of fnmatch-patterns - `translate`-class allowes for individual `add_missing`-flag
phorward
added
the
Priority: High
Conflicts: src/viur/core/i18n.py
sveneberth
reviewed
Jan 25, 2025
| ) | ||
| if self.key not in systemTranslations: | ||
| # either the translate()-object has add_missing set | ||
| if not (add_missing := self.add_missing): |
There was a problem hiding this comment.
I find this behaviour confusing.
- So I set
add_missingset toFalse, but ifconf.i18n.add_missing_translationsisTrue, it is added anyway.
Ifadd_missingis set toTrue, it doesn't matter what is inconf.i18n.add_missing_translationsand it's added too.
I would see this as a common condition:
If self.add_missing and conf.i18n.add_missing_translations are both True, add, otherwise not.
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.
This pull request summarizes several problems:
viur.core-tr_key-prefixtr_keyrequiredconf.i18n.add_missing_translationsto only add or ingore a specific pattern (fnmatch)translation.dump()function for JSON-based retrieval of both public and private translations.SelectBonewith auto-create-translation-flagdefault_variablesImplementdefault_variablesini18n.translate#1379translate-Module a standard view for System-translations + Public translationstranslateto use it askeyfor the new object