Fixed dynamic imports of locale - removed unused properties

UniversalViewer · Jan 25, 2024 · 4e71ec4 · 4e71ec4
1 parent d74e34d
commit 4e71ec4
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 48 deletions.
diff --git a/src/content-handlers/iiif/extensions/uv-aleph-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-aleph-extension/Extension.ts
@@ -31,9 +31,6 @@ export default class Extension extends BaseExtension<Config>
  settingsDialogue: SettingsDialogue;
  shareDialogue: ShareDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/extensions/uv-av-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-av-extension/Extension.ts
@@ -33,9 +33,6 @@ export default class Extension extends BaseExtension<Config>
  settingsDialogue: SettingsDialogue;
  shareDialogue: ShareDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
  lastAvCanvasIndex?: number;
 
  create(): void {

diff --git a/src/content-handlers/iiif/extensions/uv-default-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-default-extension/Extension.ts
@@ -29,9 +29,6 @@ export default class Extension extends BaseExtension<Config>
  rightPanel: MoreInfoRightPanel;
  settingsDialogue: SettingsDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/extensions/uv-ebook-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-ebook-extension/Extension.ts
@@ -37,9 +37,6 @@ export default class Extension extends BaseExtension<Config>
  shareDialogue: ShareDialogue;
  cfiFragement: string;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/extensions/uv-mediaelement-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-mediaelement-extension/Extension.ts
@@ -46,9 +46,6 @@ export default class Extension extends BaseExtension<Config>
  rightPanel: MoreInfoRightPanel;
  settingsDialogue: SettingsDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/extensions/uv-model-viewer-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-model-viewer-extension/Extension.ts
@@ -41,9 +41,6 @@ export default class ModelViewerExtension extends BaseExtension<Config> {
  settingsDialogue: SettingsDialogue;
  shareDialogue: ShareDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/extensions/uv-openseadragon-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-openseadragon-extension/Extension.ts
@@ -82,9 +82,6 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
  settingsDialogue: SettingsDialogue;
  shareDialogue: ShareDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/extensions/uv-pdf-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-pdf-extension/Extension.ts
@@ -33,9 +33,6 @@ export default class Extension extends BaseExtension<Config>
  rightPanel: MoreInfoRightPanel;
  settingsDialogue: SettingsDialogue;
  defaultConfig: Config = defaultConfig;
- locales = {
- "en-GB": defaultConfig,
- };
 
  create(): void {
  super.create();

diff --git a/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts b/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts
@@ -55,7 +55,7 @@ export class BaseExtension<T extends BaseConfig> implements IExtension {
  $element: JQuery;
  $loginDialogue: JQuery;
  $restrictedDialogue: JQuery;
- authDialogue: AuthDialogue;
+ authDialogue: AuthDialogue; 
  annotations: AnnotationGroup[] = [];
  clickThroughDialogue: ClickThroughDialogue;
  extensionHost: IIIFExtensionHost;
@@ -75,11 +75,19 @@ export class BaseExtension<T extends BaseConfig> implements IExtension {
  restrictedDialogue: RestrictedDialogue;
  shell: Shell;
  shifted: boolean = false;
- store: StoreApi<ExtensionState>;
+ store: StoreApi<ExtensionState>; 
  tabbing: boolean = false;
  browserDetect: BrowserDetect;
  locales = {};
- defaultConfig: T;
+ defaultConfig: T = {} as any;
+ localeLoaders: Record<string, () => Promise<any>> = {
+ "en-GB": () => import("../../../../locales/en-GB.json"),
+ "cy-GB": () => import("../../../../locales/cy-GB.json"),
+ "fr-FR": () => import("../../../../locales/fr-FR.json"),
+ "pl-PL": () => import("../../../../locales/pl-PL.json"),
+ "sv-SE": () => import("../../../../locales/sv-SE.json"),
+ };
+
 
  public create(): void {
  const that = this;
@@ -469,33 +477,15 @@ export class BaseExtension<T extends BaseConfig> implements IExtension {
  }
 
  public async loadConfig(locale: string, extension: string): Promise<any> {
- let uv_locale = locale;
- if (extension) {
- uv_locale = "_";
- this.locales["_"] = () =>
- import(`../../extensions/${extension}/config/config.json`);
- }
-
- let config = this.locales[uv_locale];
-
- if (!config) {
- throw new Error("Unable to load config");
- }
- if (typeof config === "object") {
- config = JSON.parse(JSON.stringify(config));
- } else if (typeof config === "function") {
- config = await config();
- config = JSON.parse(JSON.stringify(config));
- }
-
- return this.translateLocale(config, locale);
+ return this.translateLocale(this.defaultConfig, locale);
  }
 
  private async translateLocale(
  config: Object,
  locale: String
  ): Promise<Object> {
- let localeStrings = await import(`../../../../locales/${locale}.json`);
+ let loader = this.localeLoaders[locale as any] || this.localeLoaders["en-GB"];
+ let localeStrings = (await loader()) || {};
  let conf = JSON.stringify(config);
 
  for (let str in localeStrings) {