Changes attribution close button label. Fixes UniversalViewer#1075 (U…

…niversalViewer#1169)
LlGC-jop · Oct 30, 2024 · c394516 · c394516
1 parent b808053
commit c394516
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 13 deletions.
diff --git a/src/content-handlers/iiif/BaseConfig.ts b/src/content-handlers/iiif/BaseConfig.ts
@@ -157,6 +157,7 @@ export type CenterPanelOptions = {
 export type CenterPanelContent = {
   attribution: string;
   close: string;
+  closeAttribution: string;
 };
 
 type CenterPanel = ModuleConfig & {

diff --git a/src/content-handlers/iiif/extensions/uv-aleph-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-aleph-extension/config/config.json
@@ -200,7 +200,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "alephCenterPanel": {
@@ -213,7 +214,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "settingsDialogue": {

diff --git a/src/content-handlers/iiif/extensions/uv-av-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-av-extension/config/config.json
@@ -227,7 +227,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "avCenterPanel": {
@@ -250,6 +251,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "currentTime": "$currentTime",
         "delimiter": " - ",
         "duration": "$duration",

diff --git a/src/content-handlers/iiif/extensions/uv-default-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-default-extension/config/config.json
@@ -94,7 +94,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "fileLinkCenterPanel": {
@@ -106,7 +107,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "footerPanel": {

diff --git a/src/content-handlers/iiif/extensions/uv-ebook-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-ebook-extension/config/config.json
@@ -196,7 +196,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "ebookCenterPanel": {
@@ -208,7 +209,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "settingsDialogue": {

diff --git a/src/content-handlers/iiif/extensions/uv-mediaelement-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-mediaelement-extension/config/config.json
@@ -154,7 +154,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "mediaelementCenterPanel": {
@@ -169,7 +170,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "restrictedDialogue": {

diff --git a/src/content-handlers/iiif/extensions/uv-model-viewer-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-model-viewer-extension/config/config.json
@@ -245,7 +245,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "modelViewerCenterPanel": {
@@ -262,6 +263,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "zoomIn": "$zoomIn",
         "zoomOut": "$zoomOut",
         "vr": "$vr"

diff --git a/src/content-handlers/iiif/extensions/uv-openseadragon-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-openseadragon-extension/config/config.json
@@ -334,7 +334,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "openSeadragonCenterPanel": {
@@ -364,6 +365,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "goHome": "$goHome",
         "imageUnavailable": "$imageUnavailable",
         "next": "$next",

diff --git a/src/content-handlers/iiif/extensions/uv-pdf-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-pdf-extension/config/config.json
@@ -186,7 +186,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "pdfCenterPanel": {
@@ -200,6 +201,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "next": "$next",     
         "previous": "$previous"
       }

diff --git a/src/content-handlers/iiif/modules/uv-shared-module/CenterPanel.ts b/src/content-handlers/iiif/modules/uv-shared-module/CenterPanel.ts
@@ -73,7 +73,7 @@ export class CenterPanel<
     this.closeAttribution();
 
     this.$closeAttributionButton = this.$attribution.find(".header .close");
-    this.$closeAttributionButton.attr("aria-label", this.content.close);
+    this.$closeAttributionButton.attr("aria-label", this.content.closeAttribution);
     this.$closeAttributionButton.on("click", (e) => {
       e.preventDefault();
       this.closeAttribution();

diff --git a/src/locales/cy-GB.json b/src/locales/cy-GB.json
@@ -13,6 +13,7 @@
   "$contents": "Cynnwys",
   "$volume": "cyfrol",
   "$close": "Cau",
+  "$closeAttribution": "Cau panel priodoledd",
   "$allPages": "Pob Tudalen",
   "$currentViewAsJpg": "Delwedd ddethol {0} x {1}px (jpg)",
   "$openNewWindow": "Agor mewn dwy ffenest newydd.",

diff --git a/src/locales/en-GB.json b/src/locales/en-GB.json
@@ -13,6 +13,7 @@
   "$contents": "Contents",
   "$volume": "volume",
   "$close": "Close",
+  "$closeAttribution": "Close attribution panel",
   "$allPages": "All Pages",
   "$currentViewAsJpg": "Current view {0} x {1}px (jpg)",
   "$openNewWindow": "Opens in a new window",

diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json
@@ -13,6 +13,7 @@
   "$contents": "Contenus",
   "$volume": "volume",
   "$close": "Fermer",
+  "$closeAttribution": "Fermer le panneau d'attribution",
   "$allPages": "Toutes les pages",
   "$currentViewAsJpg": "Vue actuelle {0} x {1}px (jpg)",
   "$openNewWindow": "Ouvre une nouvelle fenêtre",

diff --git a/src/locales/pl-PL.json b/src/locales/pl-PL.json
@@ -13,6 +13,7 @@
   "$contents": "Zawartość",
   "$volume": "tom",
   "$close": "Zamknij",
+  "$closeAttribution": "Zamknij panel atrybucji",
   "$allPages": "Wszystkie strony",
   "$currentViewAsJpg": "Aktualny widok {0} x {1}px (jpg)",
   "$openNewWindow": "Otwiera się w nowym oknie",

diff --git a/src/locales/sv-SE.json b/src/locales/sv-SE.json
@@ -13,6 +13,7 @@
   "$contents": "Innehåll",
   "$volume": "volym",
   "$close": "Stäng",
+  "$closeAttribution": "Stäng upphovspanelen",
   "$allPages": "Alla sidor",
   "$currentViewAsJpg": "Aktuell vy {0} x {1}px (jpg)",
   "$openNewWindow": "Öppnas i nytt fönster",