Merge pull request #3665 from benwbrum/3663-iiif-manifest-hash-descri…

…ption Handle multi-lingual IIIF manifest descriptions for #3663
benwbrum · May 31, 2023 · 35c922b · 35c922b
2 parents d813fdd + 9370975
commit 35c922b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -188,7 +188,12 @@ def value_to_html(value)
         return value.map {|e| e["@value"]}.join("; ")
       end
     elsif value.is_a? Hash
-      return value.values.map{|value_array| value_array.first}.join('<br/>')
+      # is this a pre-IIIF-v3 multi-language value?
+      if value.keys.include?('@language') && value.keys.include?('@value')
+        return value["@value"]
+      else
+        return value.values.map{|value_array| value_array.first}.join('<br/>')
+      end
     end
   end
 

diff --git a/app/models/sc_manifest.rb b/app/models/sc_manifest.rb
@@ -247,7 +247,7 @@ def manifest_canvas_to_sc_canvas(canvas)
   def html_description
     description=self.description
     unless description.blank?
-      description += ScManifest.flatten_element(self.description) + "\n<br /><br />\n"
+      description = ScManifest.flatten_element(self.description) + "\n<br /><br />\n"
     end
 
     description

diff --git a/app/views/sc_collections/explore_manifest.html.slim b/app/views/sc_collections/explore_manifest.html.slim
@@ -4,11 +4,10 @@
     -if @sc_collection
       p= t('.collection', sc_collection: (@sc_collection.label))
     -if @sc_manifest.description
-      p= t('.description', description: (@sc_manifest.description))
-
-    -if @sc_manifest.metadata
+      p== t('.description', description: @sc_manifest.html_description)
+	  -if @sc_manifest.metadata
       p== t('.metadata', metadata: (html_metadata(@sc_manifest.metadata)))
-
+	
     -if @sc_manifest.v3?
       -unless @sc_manifest.requiredStatement.blank?
         p Required Statement: #{@sc_manifest.requiredStatement}

diff --git a/config/locales/sc_collections/sc_collections-de.yml b/config/locales/sc_collections/sc_collections-de.yml
@@ -31,13 +31,13 @@ de:
     explore_manifest:
       canvases: 'Canvases:'
       collection: 'Collection: %{sc_collection}'
-      description: 'Beschreibung: %{description}}'
+      description: 'Beschreibung: %{description}'
       id: 'ID:'
       import_manifest: Manifest importieren
       import_ocr_text: OCR-Text importieren
       license: 'Lizenz: %{license}'
-      manifest: 'Manifest: %{sc_manifest}}'
-      metadata: 'Metadaten: %{metadata}}'
+      manifest: 'Manifest: %{sc_manifest}'
+      metadata: 'Metadaten: %{metadata}'
       select_a_collection_to_import_into: "- Wählen Sie eine Sammlung aus, in die importiert werden soll -"
       select_a_collection_to_import_into_label: Wählen Sie eine Sammlung aus, in die importiert werden soll
     import:

diff --git a/config/locales/sc_collections/sc_collections-en.yml b/config/locales/sc_collections/sc_collections-en.yml
@@ -31,13 +31,13 @@ en:
     explore_manifest:
       canvases: 'Canvases:'
       collection: 'Collection: %{sc_collection}'
-      description: 'Description: %{description}}'
+      description: 'Description: %{description}'
       id: 'Id:'
       import_manifest: Import Manifest
       import_ocr_text: Import OCR text
       license: 'License: %{license}'
-      manifest: 'Manifest: %{sc_manifest}}'
-      metadata: 'Metadata: %{metadata}}'
+      manifest: 'Manifest: %{sc_manifest}'
+      metadata: 'Metadata: %{metadata}'
       select_a_collection_to_import_into: "- Select a collection to import into -"
       select_a_collection_to_import_into_label: Select a collection to import into
     import:

diff --git a/config/locales/sc_collections/sc_collections-es.yml b/config/locales/sc_collections/sc_collections-es.yml
@@ -31,13 +31,13 @@ es:
     explore_manifest:
       canvases: 'Lienzos:'
       collection: 'Colección: %{sc_collection}'
-      description: 'Descripción: %{description}}'
+      description: 'Descripción: %{description}'
       id: 'Identificación:'
       import_manifest: Manifiesto de importación
       import_ocr_text: Importar texto OCR de CONTENTdm
       license: 'Licencia: %{license}'
-      manifest: 'Manifiesto: %{sc_manifest}}'
-      metadata: 'Metadatos: %{metadata}}'
+      manifest: 'Manifiesto: %{sc_manifest}'
+      metadata: 'Metadatos: %{metadata}'
       select_a_collection_to_import_into: "- Seleccione una colección para importar a -"
       select_a_collection_to_import_into_label: Seleccione una colección para importar a
     import:

diff --git a/config/locales/sc_collections/sc_collections-pt.yml b/config/locales/sc_collections/sc_collections-pt.yml
@@ -31,13 +31,13 @@ pt:
     explore_manifest:
       canvases: 'Telas:'
       collection: 'Coleção: %{sc_collection}'
-      description: 'Descrição: %{description}}'
+      description: 'Descrição: %{description}'
       id: 'Identidade:'
       import_manifest: Importar Manifesto
       import_ocr_text: Importar texto OCR do CONTENTdm
       license: 'Licença: %{license}'
-      manifest: 'Manifesto: %{sc_manifest}}'
-      metadata: 'Metadados: %{metadata}}'
+      manifest: 'Manifesto: %{sc_manifest}'
+      metadata: 'Metadados: %{metadata}'
       select_a_collection_to_import_into: "- Selecione uma coleção para importar -"
       select_a_collection_to_import_into_label: Selecione uma coleção para importar
     import: