Skip to content

Fixed dynamic imports of locale - removed unused properties#959

Merged
demiankatz merged 3 commits into
devfrom
feature/lang-fix
Feb 1, 2024
Merged

Fixed dynamic imports of locale - removed unused properties#959
demiankatz merged 3 commits into
devfrom
feature/lang-fix

Conversation

@stephenwf

Copy link
Copy Markdown
Contributor

Description of what you did:

@codesandbox

codesandbox Bot commented Jan 25, 2024

Copy link
Copy Markdown

Review or Edit in CodeSandbox

Open the branch in Web EditorVS CodeInsiders

Open Preview

@vercel

vercel Bot commented Jan 25, 2024

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
universalviewer ✅ Ready (Inspect) Visit Preview 💬 Add feedback Feb 1, 2024 4:37pm

@codesandbox-ci

codesandbox-ci Bot commented Jan 25, 2024

Copy link
Copy Markdown

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:

Sandbox Source
React Configuration
uv-react-demo Configuration
uv-simple-example Configuration
uv-simple-example-with-url-adapter Configuration
uv-config-example Configuration
uv-nextjs-example Configuration

Comment thread src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts Outdated
let uv_locale = locale;
if (extension) {
uv_locale = "_";
this.locales["_"] = () =>

Copy link
Copy Markdown
Contributor

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.

@stephenwf stephenwf Jan 25, 2024

Copy link
Copy Markdown
Contributor Author

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!

Copy link
Copy Markdown
Contributor

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...

Copy link
Copy Markdown
Contributor Author

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)

Copy link
Copy Markdown
Contributor

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... :-) ).

@hackartisan

Copy link
Copy Markdown

We tried our local branch against this branch and it resolved the problem.

@stephenwf stephenwf changed the base branch from main to dev February 1, 2024 16:34
@hackartisan

Copy link
Copy Markdown

We need this to be rebased on the dev branch in order to try these changes alongside the config reversion that @edsilv did recently.

@demiankatz

Copy link
Copy Markdown
Contributor

@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.

@hackartisan

Copy link
Copy Markdown

Confirmed this resolves the errors we were seeing.

@demiankatz demiankatz left a comment

Copy link
Copy Markdown
Contributor

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.

@demiankatz demiankatz merged commit 4923bcd into dev Feb 1, 2024
@demiankatz demiankatz mentioned this pull request Feb 6, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants