Merge branch 'dev' of https://github.com/UniversalViewer/universalviewer

into dev
UniversalViewer · Apr 10, 2024 · 92ea59e · 92ea59e
2 parents 7fa003b + 393fe63
commit 92ea59e
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();
@@ -1284,7 +1281,7 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
 
   getImageId(canvas: Canvas): string | null {
     if (canvas.externalResource) {
-      const id: string | undefined = canvas.externalResource.data["@id"];
+      const id: string | undefined = canvas.externalResource.data["@id"] || canvas.externalResource.data.id;
 
       if (id) {
         return id.substr(id.lastIndexOf("/") + 1);
@@ -1342,7 +1339,7 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
             id += "/";
           }
 
-          if (Utils.isImageProfile(service.getProfile())) {
+          if (Utils.isImageProfile(service.getProfile()) || Utils.isImageServiceType(service.getIIIFResourceType())) {
             infoUri = id + "info.json";
           }
         }

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
@@ -79,7 +79,15 @@ export class BaseExtension<T extends BaseConfig> implements IExtension {
   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) {