Fix standalone registeration #556
Merged
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
susnux
reviewed
Jan 13, 2023
susnux
approved these changes
Jan 13, 2023
Registration of a translation bundle in standalone application didn't work without initializing global `_oc_l10n_registry_*` objects. Add global registry initialization in `register` function. Signed-off-by: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
Signed-off-by: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
ShGKme
force-pushed
the
fix-standalone-register
branch
from
4a49f1f
to
f801f7d
Compare
ShGKme
commented
Jan 13, 2023
Comment on lines
68
to
79
| export function getAppTranslations(appId: string): AppTranslations { | ||
| if ( | ||
| typeof window._oc_l10n_registry_translations === 'undefined' | ||
| || typeof window._oc_l10n_registry_plural_functions === 'undefined' | ||
| typeof window._oc_l10n_registry_translations?.[appId] === 'undefined' | ||
| || typeof window._oc_l10n_registry_plural_functions?.[appId] === 'undefined' | ||
| ) { | ||
| console.warn('No OC L10N registry found') | ||
| return { | ||
| translations: {}, | ||
| pluralFunction: (number: number) => number, | ||
| } | ||
| console.warn(`No translation for appId "${appId}" have been registered`) | ||
| } | ||
|
|
||
| return { | ||
| translations: window._oc_l10n_registry_translations[appId] || {}, | ||
| pluralFunction: window._oc_l10n_registry_plural_functions[appId], | ||
| translations: window._oc_l10n_registry_translations?.[appId] ?? {}, | ||
| pluralFunction: window._oc_l10n_registry_plural_functions?.[appId] ?? ((number: number) => number), | ||
| } | ||
| } |
There was a problem hiding this comment.
Update warns logic here.
Since it doesn't matter if "no app translation has been registered" or "only appId hasn't been registered", check both situations with optional chaining.
Warn is always about concrete appId, as there is no "general translation registration." It is always some app translation registration.
Also, return default stub for both translations and pluralFunction if there is no value.
susnux
approved these changes
Jan 17, 2023
Merged
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.
In 2.0.0
@nextcluod/l10nbecame independent from globalOCfor being standalone.That is great and really useful for me.
But a translation registration requires global
window._oc_l10n_registry_*objects to exist. Otherwise, registration fails withCannot get property of undefined._oc_l10n_registry_objects existence and creating if they do not exist.