Merge branch 'develop' into single-image-filmstrip-fix

ProjectMirador · Aug 21, 2017 · 54f13cd · 54f13cd
2 parents d9808ea + 121def3
commit 54f13cd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/js/src/widgets/layersTab.js b/js/src/widgets/layersTab.js
@@ -169,7 +169,7 @@
                 disabledOpacityMessage: i18next.t('disabledOpacityMessage'),
                 emptyTemplateMessage: i18next.t('emptyTemplateMessage'),
                 imageId: imageResource.id,
-                title: imageResource.label,
+                title: imageResource.label === 'No Label' ? i18next.t('noLabel') : imageResource.label,
                 opacity: imageResource.getOpacity()*100, // scale factor for limitations of html5 slider element
                 loadingStatus: imageResource.getStatus(),
                 visibility: imageResource.getVisible(),

diff --git a/js/src/widgets/searchTab.js b/js/src/widgets/searchTab.js
@@ -116,11 +116,11 @@
 
         _this.element.find(".js-search-expanded").slideToggle("fast");
 
-        if (jQuery(this).text() === "more"){
-          jQuery(this).html("less");
+        if (jQuery(this).text() === i18next.t("more")){
+          jQuery(this).text(i18next.t("less"));
         }
-        else if (jQuery(this).text() === "less"){
-          jQuery(this).html("more");
+        else if (jQuery(this).text() === i18next.t("less")){
+          jQuery(this).text(i18next.t("more"));
         }
       });
 
@@ -168,9 +168,9 @@
           '<form id="search-within-form" class="js-perform-query">',
             '<input class="js-query" type="text" placeholder="{{t "searchText"}}"/>',
 
-            '<input style="margin: 10px 0" type="submit"/>',
+            '<input style="margin: 10px 0" type="submit" value="{{t "submit"}}"/>',
 
-            '<a class="js-search-expand" style="display: block; margin: 0 0 5px 0">more</a>',
+            '<a class="js-search-expand" style="display: block; margin: 0 0 5px 0">{{t "more"}}</a>',
             '<div class="js-search-expanded" style="display: none;">',
               '<input class="js-motivation" type="text" placeholder="motivation"/>',
               '<input class="js-date" type="text" placeholder="date"/>',

diff --git a/locales/de/translation.json b/locales/de/translation.json
@@ -29,13 +29,16 @@
     "deleteShape":"Wollen Sie diesen Marker löschen?",
     "description": "Beschreibung",
     "details": "Details",
+    "disabledLayersTabMessage": "Bildebenen sind nur in der Einzelbildanzeige verfügbar",
+    "disabledOpacityMessage": "deaktiviert",
     "dotDashed":"Punkte &amp; Striche",
     "dropToLoad": "Hier ablegen um das Manifest zu laden",
     "edit": "Bearbeiten",
     "editModalBtnDeleteAnnotation":"Annotation löschen",
     "editModalBtnSaveWithoutShapes":"Annotation ohne Marker speichern",
     "editModalSaveAnnotationWithNoShapesMsg":"Mit dieser Annotation sind keine Marker verknüpft",
     "ellipseTooltip": "Oval",
+    "emptyTemplateMessage": "Auf diesem Canvas gibt es keine Bildebenen",
     "fillColorTooltip": "Füllfarbe wählen",
     "filterObjects": "Objekte filtern",
     "freehandTooltip": "Freihand",
@@ -44,20 +47,26 @@
     "fullScreenWindowTooltip": "Dieses Fenster als Vollbild anzeigen",
     "grayscaleTooltip": "Graustufen umstellen",
     "imageManipulationTooltip": "Bild-Manipulation",
+    "imagesFor": "Bilder für",
     "imageView": "Einzelbild",
     "invertTooltip": "Farben umkehren",
     "item": "Objekt",
     "items": "Objekte",
+    "less": "weniger",
     "license": "Lizenz",
     "links": "Links",
     "load": "Laden",
     "logo": "Logo",
+    "manifest": "IIIF-Manifest",
     "metadataTooltip": "Informationen/Metadaten über dieses Objekt anzeigen",
+    "mirrorTooltip": "Bild spiegeln",
     "more": "mehr",
     "newObject": "Neues Objekt",
     "no": "Nein",
     "noIndex": "Kein Inhaltsverzeichnis verfügbar",
+    "noLabel": "Kein Label",
     "objectMetadata": "Metadaten des Objekts",
+    "opacityLabel": "Deckkraft",
     "pinTooltip": "Stecknadel",
     "pointerTooltip": "Auswählen",
     "polygonTooltip": "Polygon",
@@ -71,16 +80,24 @@
     "saturationTooltip": "Sättigung anpassen",
     "save": "Speichern",
     "scrollView": "Horizontales Scrollen",
+    "searchLabelSelect": "Suchdienst auswählen",
+    "searchNotAvailable": "Kein Suchdienst verfügbar",
+    "searchText": "Suchtext",
     "seeAlso": "Siehe auch",
     "selectGrid": "Anordnung auswählen",
     "sidePanelTooltip": "Seitenleiste",
     "solid": "Durchgängig",
+    "submit": "Senden",
+    "tabTitleIndex": "Index",
+    "tabTitleLayers": "Ebenen",
+    "tabTitleSearch": "Suche",
     "thick": "Dick",
     "thickest": "Dicker",
     "thumbnailsView": "Galerie",
     "unspecified": "nicht spezifiziert",
     "url": "URL",
     "viewTypeTooltip": "Ansichtstyp wechseln",
+    "visibleLabel": "sichtbar",
     "within": "Teil von",
     "yes": "Ja"
 }
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -53,6 +53,7 @@
   "item": "item",
   "items": "items",
   "label": "Label",
+  "less": "less",
   "license": "License",
   "links": "Links",
   "load": "Load",
@@ -64,6 +65,7 @@
   "newObject": "Replace Object",
   "no": "No",
   "noIndex": "No index available",
+  "noLabel": "No Label",
   "objectMetadata": "Object Metadata",
   "opacityLabel": "opacity",
   "pinTooltip": "Pin annotation",
@@ -86,6 +88,7 @@
   "selectGrid": "Select a grid below",
   "sidePanelTooltip": "Toggle the side panel",
   "solid": "Solid",
+  "submit": "Submit",
   "tabTitleIndex": "Index",
   "tabTitleLayers": "Layers",
   "tabTitleSearch": "Search",