Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions __tests__/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,25 @@ describe("Universal Viewer", () => {
expect(galleryViewAfterTwoUpToggle).toBe("hidden");
});

it("labels gallery thumbnail size controls", async () => {
await page.waitForSelector(".iiif-gallery-component .size-down");

const labels = await page.$$eval(
[
".iiif-gallery-component .size-down",
".iiif-gallery-component input[type='range'][name='size']",
".iiif-gallery-component .size-up",
].join(", "),
(controls) => controls.map((control) => control.getAttribute("aria-label"))
);

expect(labels).toEqual([
"Decrease thumbnail size",
"Thumbnail size",
"Increase thumbnail size",
]);
});

it("settings button is visible", async () => {
await page.waitForSelector(".btn.imageBtn.settings");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,13 @@ type ContentLeftPanelOptions = ExpandPanelOptions & {

type ContentLeftPanelContent = ExpandPanelContent & {
date: string;
decreaseThumbnailSize: string;
index: string;
increaseThumbnailSize: string;
manifestRanges: string;
searchResult: string;
searchResults: string;
thumbnailSize: string;
sortBy: string;
thumbnails: string;
title: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,15 @@
"collapse": "$collapse",
"collapseFull": "$collapseFull",
"date": "$date",
"decreaseThumbnailSize": "$decreaseThumbnailSize",
"expand": "$expandContents",
"expandFull": "$expandGallery",
"index": "$index",
"increaseThumbnailSize": "$increaseThumbnailSize",
"manifestRanges": "$manifestRanges",
"searchResult": "$searchResult",
"searchResults": "$searchResults",
"thumbnailSize": "$thumbnailSize",
"sortBy": "$sortBy",
"thumbnails": "$thumbnails",
"title": "$contents",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ type MultiSelectDialogueOptions = DialogueOptions & {
};

type MultiSelectDialogueContent = DialogueContent & {
decreaseThumbnailSize: string;
download: string;
increaseThumbnailSize: string;
selectAll: string;
thumbnailSize: string;
title: string;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,15 @@
"collapse": "$collapse",
"collapseFull": "$collapseFull",
"date": "$date",
"decreaseThumbnailSize": "$decreaseThumbnailSize",
"expand": "$expandContents",
"expandFull": "$expandGallery",
"index": "$index",
"increaseThumbnailSize": "$increaseThumbnailSize",
"manifestRanges": "$manifestRanges",
"searchResult": "$searchResult",
"searchResults": "$searchResults",
"thumbnailSize": "$thumbnailSize",
"sortBy": "$sortBy",
"thumbnails": "$thumbnails",
"title": "$contents",
Expand Down Expand Up @@ -280,8 +283,11 @@
},
"content": {
"close": "$close",
"decreaseThumbnailSize": "$decreaseThumbnailSize",
"download": "$download",
"increaseThumbnailSize": "$increaseThumbnailSize",
"selectAll": "$selectAll",
"thumbnailSize": "$thumbnailSize",
"title": "$selectPagesForDownload"
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ import { BaseComponent, IBaseComponentOptions } from "@iiif/base-component";
import { Strings, Maths } from "../../Utils";

export interface IGalleryComponentContent {
decreaseThumbnailSize: string;
increaseThumbnailSize: string;
searchResult: string;
searchResults: string;
thumbnailSize: string;
download: string;
selectAll: string;
}
Expand Down Expand Up @@ -60,6 +63,11 @@ export class GalleryComponent extends BaseComponent {

constructor(options: IBaseComponentOptions) {
super(options);
this.options.data.content = Object.assign(
{},
this.data().content,
this.options.data.content
);
this._data = this.options.data;
this._init();
this._resize();
Expand All @@ -81,19 +89,19 @@ export class GalleryComponent extends BaseComponent {

this._$sizeDownButton = $(
'<input class="btn btn-default size-down" type="button" value="-" />'
);
).attr("aria-label", this.options.data.content.decreaseThumbnailSize);
this._$leftOptions.append(this._$sizeDownButton);

this._$sizeRange = $(
'<input type="range" name="size" min="1" max="10" value="' +
this.options.data.initialZoom +
'" />'
);
).attr("aria-label", this.options.data.content.thumbnailSize);
this._$leftOptions.append(this._$sizeRange);

this._$sizeUpButton = $(
'<input class="btn btn-default size-up" type="button" value="+" />'
);
).attr("aria-label", this.options.data.content.increaseThumbnailSize);
this._$leftOptions.append(this._$sizeUpButton);

this._$multiSelectOptions = $('<div class="multiSelectOptions"></div>');
Expand Down Expand Up @@ -199,8 +207,11 @@ export class GalleryComponent extends BaseComponent {
return {
chunkedResizingThreshold: 400,
content: <IGalleryComponentContent>{
decreaseThumbnailSize: "Decrease thumbnail size",
increaseThumbnailSize: "Increase thumbnail size",
searchResult: "{0} search result",
searchResults: "{0} search results",
thumbnailSize: "Thumbnail size",
},
debug: false,
helper: null,
Expand Down
3 changes: 3 additions & 0 deletions src/locales/cy-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@
"$shareLink": "Dolen i'r dudalen hon",
"$shareInstructions": "Er mwyn rhannu'r eitem hon, cop\u00efwch y URL isod.",
"$size": "Maint:",
"$decreaseThumbnailSize": "Lleihau maint bawdluniau",

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.

Where/how did you source your non-English translations? Do we need to have our translation team review them for accuracy?

"$thumbnailSize": "Maint bawdluniau",
"$increaseThumbnailSize": "Cynyddu maint bawdluniau",
"$width": "Lled",
"$cancel": "Canslo",
"$confirm": "Cadarnhau",
Expand Down
3 changes: 3 additions & 0 deletions src/locales/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@
"$shareLink": "Link to this Page",
"$shareInstructions": "To share this item, copy the URL below.",
"$size": "Size:",
"$decreaseThumbnailSize": "Decrease thumbnail size",
"$thumbnailSize": "Thumbnail size",
"$increaseThumbnailSize": "Increase thumbnail size",
"$width": "Width",
"$cancel": "Cancel",
"$confirm": "Confirm",
Expand Down
3 changes: 3 additions & 0 deletions src/locales/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
"$shareLink": "Un lien vers cette page",
"$shareInstructions": "Pour partager ce contenu, copier l'URL ci-dessous.",
"$size": "Taille :",
"$decreaseThumbnailSize": "Réduire la taille des vignettes",
"$thumbnailSize": "Taille des vignettes",
"$increaseThumbnailSize": "Augmenter la taille des vignettes",
"$width": "Largeur",
"$cancel": "Annuler",
"$confirm": "Confirmer",
Expand Down
3 changes: 3 additions & 0 deletions src/locales/pl-PL.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
"$shareLink": "Link do tej strony",
"$shareInstructions": "Aby udostępnić ten obiekt, skopiuj poniższy adres URL.",
"$size": "Rozmiar:",
"$decreaseThumbnailSize": "Zmniejsz rozmiar miniatur",
"$thumbnailSize": "Rozmiar miniatur",
"$increaseThumbnailSize": "Zwiększ rozmiar miniatur",
"$width": "Szerokość",
"$cancel": "Anuluj",
"$confirm": "Potwierdź",
Expand Down
3 changes: 3 additions & 0 deletions src/locales/sv-SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
"$shareLink": "Länk till denna sida",
"$shareInstructions": "Kopiera länken nedan för att dela det här objektet.",
"$size": "Storlek:",
"$decreaseThumbnailSize": "Minska miniatyrstorlek",
"$thumbnailSize": "Miniatyrstorlek",
"$increaseThumbnailSize": "Öka miniatyrstorlek",
"$width": "Bredd",
"$cancel": "Avbryt",
"$confirm": "Bekräfta",
Expand Down