-
-
Notifications
You must be signed in to change notification settings - Fork 191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed dynamic imports of locale - removed unused properties #959
Conversation
Review or Edit in CodeSandboxOpen the branch in Web Editor • VS Code • Insiders |
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. Latest deployment of this branch, based on commit 3930eef:
|
src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts
Outdated
Show resolved
Hide resolved
let uv_locale = locale; | ||
if (extension) { | ||
uv_locale = "_"; | ||
this.locales["_"] = () => |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you intentionally dropping the extension config loading? If so, the extension parameter on this method no longer serves a purpose. If not, we need to figure out how to approach it. I'm guessing it's probably still needed, but wondering if perhaps Ed's recent refactoring changed something.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I couldn't find any extension that didn't have a single configuration file. If an extension requires localisation in the future, it can figure that out itself!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought the way this worked was that it loaded the extension-specific config file, and then replaced the localization placeholders in that file with strings retrieved from the locale file. If we remove the loading of the extension-specific config file, I don't see how we have the framework on which to inject all the translations... but maybe I'm missing some initialization of this.defaultConfig somewhere...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, so as I understand it, each extension has the import for the config.
// extensions/[name]/Extension.ts
import defaultConfig from './config/config.json';
class XyzExtension {
defaultConfig = defaultConfig;
// ...
}
The injections happen on line 480 using this.defaultConfig
which is cloned and patched from line 489 (I didn't change that part)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh, I see, excellent. No objections from me, then... It's a little confusing that this method now takes an argument that it doesn't use, but maybe it's worth keeping that as a hook for the future. Beyond that, if this solves the problem at hand, I don't object!
(And sorry for my uninformed questions -- the perils of trying to figure out code by looking at GitHub alone is that you don't always get the best insights... :-) ).
We tried our local branch against this branch and it resolved the problem. |
We need this to be rebased on the dev branch in order to try these changes alongside the config reversion that @edsilv did recently. |
a06ba81
to
3930eef
Compare
@hackartisan, now that this is rebased, please let us know if all the combined fixes work for you -- I can help get this merged when ready. |
Confirmed this resolves the errors we were seeing. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @stephenwf -- I'm approving and merging this after @hackartisan's successful testing.
Description of what you did: