hyrax 4.0.0.beta2 → 4.0.0.rc1

data/app/services/hyrax/valkyrie_upload.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-module Hyrax::ValkyrieUpload
+class Hyrax::ValkyrieUpload
   # @param [IO] io
   # @param [String] filename
   # @param [Hyrax::FileSet] file_set
+  # @param [Valkyrie::StorageAdapter] storage_adapter
   # @param [RDF::URI] use
   # @param [User] user
   #
@@ -19,31 +20,33 @@ module Hyrax::ValkyrieUpload
     use: Hyrax::FileMetadata::Use::ORIGINAL_FILE,
     user: nil
   )
+    new(storage_adapter: storage_adapter)
+      .upload(filename: filename, file_set: file_set, io: io, use: use, user: user)
+  end
 
-    streamfile = storage_adapter.upload(
-      file: io,
-      original_filename: filename,
-      resource: file_set,
-      use: use
-    )
-    io.close
+  ##
+  # @!attribute [r] storage_adapter
+  #   @return [Valkyrie::StorageAdapter] storage_adapter
+  attr_reader :storage_adapter
+  ##
+  # @param [Valkyrie::StorageAdapter] storage_adapter
+  def initialize(storage_adapter: Hyrax.storage_adapter)
+    @storage_adapter = storage_adapter
+  end
 
-    file_metadata = find_or_create_metadata(id: streamfile.id, file: streamfile)
+  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil)
+    streamfile = storage_adapter.upload(file: io, original_filename: filename, resource: file_set)
+    file_metadata = Hyrax::FileMetadata(streamfile)
     file_metadata.file_set_id = file_set.id
+    file_metadata.type += [use]
 
-    case use
-    when Hyrax::FileMetadata::Use::ORIGINAL_FILE
+    if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE
       # Set file set label.
       reset_title = file_set.title.first == file_set.label
       # set title to label if that's how it was before this characterization
       file_set.title = file_metadata.original_filename if reset_title
       # always set the label to the original_name
       file_set.label = file_metadata.original_filename
-    when Hyrax::FileMetadata::Use::THUMBNAIL
-      # TODO: the parent work's thumbnail_id remains incorrect (it's set to the
-      # FileSet ID, rather than the ID of this thumbnail FileMetadata; but
-      # trying to update the parent attributes here doesn't seem to stick
-      file_set.thumbnail_id = file_metadata.id
     end
 
     saved_metadata = Hyrax.persister.save(resource: file_metadata)
@@ -64,7 +67,7 @@ module Hyrax::ValkyrieUpload
   # @param [::User] user  the user performing the add
   #
   # @return [Hyrax::FileSet] updated file set
-  def self.add_file_to_file_set(file_set:, file_metadata:, user:)
+  def add_file_to_file_set(file_set:, file_metadata:, user:)
     file_set.file_ids << file_metadata.id
     set_file_use_ids(file_set, file_metadata)
 
@@ -72,12 +75,14 @@ module Hyrax::ValkyrieUpload
     Hyrax.publisher.publish('object.membership.updated', object: file_set, user: user)
   end
 
+  private
+
   # @api private
   # @param [Hyrax::FileSet] file_set the file set to add to
   # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
   #   the file to add
   # @return [void]
-  def self.set_file_use_ids(file_set, file_metadata)
+  def set_file_use_ids(file_set, file_metadata)
     file_metadata.type.each do |type|
       case type
       when Hyrax::FileMetadata::Use::ORIGINAL_FILE
@@ -91,16 +96,4 @@ module Hyrax::ValkyrieUpload
       end
     end
   end
-
-  # @api private
-  # @param [#to_s] id
-  # @param [Valkyrie::StorageAdapter::StreamFile] file
-  def self.find_or_create_metadata(id:, file:)
-    Hyrax.custom_queries.find_file_metadata_by(id: id)
-  rescue Valkyrie::Persistence::ObjectNotFoundError => e
-    Hyrax.logger.warn "Failed to find existing metadata for #{id}:"
-    Hyrax.logger.warn e.message
-    Hyrax.logger.warn "Creating Hyrax::FileMetadata now"
-    Hyrax::FileMetadata.for(file: file)
-  end
 end

data/app/services/hyrax/visibility_propagator.rb

@@ -15,13 +15,13 @@ module Hyrax
       when Hyrax::Resource # Valkyrie
         ResourceVisibilityPropagator.new(source: source)
       else
-        NullVisibilityPropogator.new(source: source)
+        NullVisibilityPropagator.new(source: source)
       end
     end
 
     ##
-    # Provides a null/logging implementation of the visibility propogator.
-    class NullVisibilityPropogator
+    # Provides a null/logging implementation of the visibility propagator.
+    class NullVisibilityPropagator
       ##
       # @!attribute [rw] source
       #   @return [#visibility]
@@ -36,8 +36,8 @@ module Hyrax
       ##
       # @return [void]
       # @raise [RuntimeError] if we're in development mode
-      def propogate
-        message =  "Tried to propogate visibility to members of #{source} " \
+      def propagate
+        message =  "Tried to propagate visibility to members of #{source} " \
                    "but didn't know what kind of object it is. Model " \
                    "name #{source.try(:model_name)}. Called from #{caller[0]}."
 

data/app/services/hyrax/workflow/status_list_service.rb

@@ -69,7 +69,7 @@ module Hyrax
         actionable_roles = roles_for_user
         Hyrax.logger.debug("Actionable roles for #{@user.user_key} are #{actionable_roles}")
         return [] if actionable_roles.empty?
-        WorkRelation.new.search_with_conditions(query(actionable_roles), method: :post)
+        WorkRelation.new.search_with_conditions(query(actionable_roles), method: Hyrax.config.solr_default_method)
       end
 
       def query(actionable_roles)

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -1,9 +1,11 @@
+<%= presenter.attribute_to_html(:alternative_title, html_dl: true) %>
 <%= presenter.attribute_to_html(:abstract, html_dl: true) %>
 <%= presenter.attribute_to_html(:date_modified, label: t('hyrax.base.show.last_modified'), html_dl: true) %>
 <%= presenter.attribute_to_html(:creator, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:contributor, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:subject, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:publisher, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:bibliographic_citation, html_dl: true) %>
 <%= presenter.attribute_to_html(:language, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:identifier, render_as: :linked, search_field: 'identifier_tesim', html_dl: true) %>
 <%= presenter.attribute_to_html(:keyword, render_as: :faceted, html_dl: true) %>

data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb

@@ -14,7 +14,7 @@
                 <p><%= t("hyrax.collection.select_form.select_heading") %></p>
               
                 <% if @add_works_to_collection.present? %>
-                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, size: '90', disabled: true %>
+                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, disabled: true %>
                   <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
                 <% else %>
                   <%= text_field_tag 'member_of_collection_ids', nil,

data/app/views/hyrax/file_sets/_permission.html.erb

@@ -1,5 +1,5 @@
   <div id="permissions_display" class="tab-pane">
-    <%= simple_form_for [main_app, file_set],
+    <%= simple_form_for [main_app, form_object],
                         html: { multipart: true,
                                 id: 'permission',
                                 data: { param_key: file_set.model_name.param_key },

data/app/views/hyrax/file_sets/edit.html.erb

@@ -33,7 +33,7 @@
             <h2><%= t('.descriptions') %></h2>
             <%= render "form" %>
           </div>
-          <%= render "permission", file_set: curation_concern %>
+          <%= render "permission", file_set: curation_concern, form_object: @form %>
           <%= render "versioning", file_set: curation_concern %>
         </div>
       </div>

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -8,7 +8,7 @@
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -4,7 +4,7 @@
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",
-      data: { label: file_set.id },
+      data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
       target: "_new" %>
   <% end %>
 </div>

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -7,7 +7,7 @@
                     role: "presentation") %>
       <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -9,7 +9,7 @@
                   hyrax.download_path(file_set),
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id } %>
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -9,7 +9,7 @@
                   hyrax.download_path(file_set),
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id } %>
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -8,7 +8,7 @@
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -3,18 +3,18 @@
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
-        <td>
+        <span>
             <span class="preview"></span>
-        </td>
-        <td>
+        </span>
+        <span>
             <p class="name">{%=file.name%}</p>
             <strong class="error text-danger"></strong>
-        </td>
-        <td>
+        </span>
+        <span>
             <p class="size">Processing...</p>
             <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </td>
-        <td class="text-right">
+        </span>
+        <span class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <span class="fa fa-upload"></span>
@@ -27,7 +27,7 @@
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
-        </td>
+        </span>
     </tr>
 {% } %}
 </script>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -37,7 +37,7 @@
 <!-- The template to display the banner once upload is complete -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade">
+        <span class="template-download fade show">
           <div id="banner">
             <div class="row branding-banner-row">
               <div class="col-sm-3">
@@ -69,7 +69,7 @@
 <!-- The template to display logo in the table once upload is complete -->
 <script id="logo-template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade">
+            <span class="template-download fade show">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">

data/app/views/hyrax/users/_vitals.html.erb

@@ -3,16 +3,16 @@
 </div>
 
 <div class="list-group-item">
-  <span class="badge"><%= number_of_collections(user) %></span>
+  <span class="badge dark-text"><%= number_of_collections(user) %></span>
   <span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
 </div>
 
 <div class="list-group-item">
-  <span class="badge"><%= number_of_works(user) %></span>
+  <span class="badge dark-text"><%= number_of_works(user) %></span>
   <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
-      <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
-      <li><span class="badge badge-optional"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
+      <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
+      <li><span class="badge badge-optional dark-text"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
   </ul>
 </div>

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.6.0
+version: 3.1.0
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
@@ -10,26 +10,26 @@ dependencies:
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
-    version: 4.2.21
+    version: 6.3.13
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: memcached.enabled
   - name: minio
-    version: 6.7.2
+    version: 12.1.14
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: minio.enabled
   - name: postgresql
-    version: 10.3.13
+    version: 12.2.5
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: postgresql.enabled
   - name: redis
-    version: 10.7.16
+    version: 17.8.7
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: redis.enabled
   - name: solr
-    version: 1.0.1
+    version: 7.2.1
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: solr.enabled
   - name: nginx
-    version: 9.8.0
+    version: 13.2.30
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: nginx.enabled

data/chart/hyrax/README.md

@@ -11,6 +11,11 @@ production-ready setup for Hyrax applications. By default it deploys:
   - Solr (in a cloud configuration, including Apache Zookeeper)
   - Redis
 
+## Minimum requirements
+
+- Kubernetes 1.21
+- Helm 3
+
 ## A base Hyrax deployment
 
 Because Hyrax is a [Rails Engine][engine]---not a stand-alone application---

data/chart/hyrax/templates/_helpers.tpl

@@ -51,6 +51,14 @@ app.kubernetes.io/name: {{ include "hyrax.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Worker Selector labels
+*/}}
+{{- define "hyrax.workerSelectorLabels" -}}
+app.kubernetes.io/name: {{ include "hyrax.name" . }}-worker
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 {{/*
 Create the name of the service account to use
 */}}
@@ -100,7 +108,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.postgresql.database" -}}
 {{- if .Values.postgresql.enabled }}
-{{- .Values.postgresql.postgresqlDatabase }}
+{{- .Values.postgresql.auth.database }}
 {{- else }}
 {{- .Values.externalPostgresql.database | default ( include "hyrax.fullname" . ) }}
 {{- end }}
@@ -108,7 +116,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.postgresql.username" -}}
 {{- if .Values.postgresql.enabled }}
-{{- .Values.postgresql.postgresqlUsername }}
+{{- .Values.postgresql.auth.username }}
 {{- else }}
 {{- .Values.externalPostgresql.username | default "postgres" }}
 {{- end }}
@@ -116,7 +124,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.postgresql.password" -}}
 {{- if .Values.postgresql.enabled }}
-{{- .Values.postgresql.postgresqlPassword }}
+{{- .Values.postgresql.auth.password }}
 {{- else }}
 {{- .Values.externalPostgresql.password }}
 {{- end }}
@@ -149,7 +157,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.solr.username" -}}
 {{- if .Values.solr.enabled }}
-{{- .Values.solr.authentication.adminUsername }}
+{{- .Values.solr.auth.adminUsername }}
 {{- else }}
 {{- .Values.externalSolrUser }}
 {{- end }}
@@ -157,7 +165,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.solr.password" -}}
 {{- if .Values.solr.enabled }}
-{{- .Values.solr.authentication.adminPassword }}
+{{- .Values.solr.auth.adminPassword }}
 {{- else }}
 {{- .Values.externalSolrPassword }}
 {{- end }}
@@ -180,7 +188,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "hyrax.redis.url" -}}
-{{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
+{{- printf "redis://:%s@%s:%s" .Values.redis.auth.password (include "hyrax.redis.host" .) "6379/0" -}}
 {{- end -}}
 
 {{- define "hyrax.nginx.host" -}}

data/chart/hyrax/templates/cron-embargo.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.embargoRelease.enabled }}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
 metadata:

data/chart/hyrax/templates/cron-lease.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.leaseRelease.enabled }}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
 metadata:

data/chart/hyrax/templates/deployment-worker.yaml

@@ -9,7 +9,7 @@ spec:
   replicas: {{ .Values.worker.replicaCount }}
   selector:
     matchLabels:
-      {{- include "hyrax.selectorLabels" . | nindent 6 }}
+      {{- include "hyrax.workerSelectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- with .Values.podAnnotations }}
@@ -17,7 +17,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
-        {{- include "hyrax.selectorLabels" . | nindent 8 }}
+        {{- include "hyrax.workerSelectorLabels" . | nindent 8 }}
     spec:
       initContainers:
         - name: db-wait

data/chart/hyrax/templates/extra-list.yaml

@@ -0,0 +1,8 @@
+{{- range .Values.extraDeploy }}
+---
+{{- if typeIs "string" . }}
+{{- tpl . $ }}
+{{- else }}
+{{- tpl (. | toYaml) $ }}
+{{- end }}
+{{- end }}

data/chart/hyrax/templates/secrets.yaml

@@ -10,13 +10,13 @@ data:
   DB_PASSWORD: {{ include "hyrax.postgresql.password" . | b64enc }}
   DATABASE_URL: {{ printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) | b64enc }}
   {{- if .Values.minio.enabled }}
-  MINIO_ACCESS_KEY: {{ .Values.minio.accessKey.password | b64enc}}
-  MINIO_SECRET_KEY: {{ .Values.minio.secretKey.password | b64enc}}
+  MINIO_ACCESS_KEY: {{ .Values.minio.auth.rootUser | b64enc}}
+  MINIO_SECRET_KEY: {{ .Values.minio.auth.rootPassword | b64enc}}
   {{- end }}
   {{- if not .Values.solrExistingSecret }}
   SOLR_ADMIN_PASSWORD: {{ include "hyrax.solr.password" . | b64enc }}
   {{- end }}
   {{- if .Values.redis.enabled }}
-  REDIS_PASSWORD: {{ .Values.redis.password | b64enc}}
+  REDIS_PASSWORD: {{ .Values.redis.auth.password | b64enc}}
   SIDEKIQ_REDIS_URL: {{ include "hyrax.redis.url" . | b64enc }}
   {{- end }}

data/chart/hyrax/values.yaml

@@ -66,6 +66,10 @@ extraEnvFrom: []
 # tty: true
 extraContainerConfiguration: []
 
+## @param extraDeploy Array of extra objects to deploy with the release (evaluated as a template)
+##
+extraDeploy: []
+
 # an existing volume containing a Hyrax-based application
 # must be a ReadWriteMany volume if worker is enabled
 applicationExistingClaim: ""
@@ -229,10 +233,9 @@ memcached:
 
 minio:
   enabled: false
-  accessKey:
-    password: hyrax-access-key
-  secretKey:
-    password: hyrax-secret-key
+  auth:
+    rootUser: hyrax-access-key
+    rootPassword: hyrax-secret-key
   persistence:
     enabled: false
   # defaultBuckets: bucketOne;bucketTwo
@@ -242,15 +245,18 @@ postgresql:
   image:
     repository: bitnami/postgresql
     tag: 12.3.0
-  postgresqlUsername: hyrax
-  postgresqlPassword: hyrax_pass
-  postgresqlDatabase: hyrax
-  servicePort: 5432
-  # cpu: 1000m
-  # memory: 1Gi
-  # persistence:
-  #   size: 10Gi
-
+  auth:
+    database: hyrax
+    password: hyrax_pass
+    username: hyrax
+  primary:
+    service:
+      ports:
+        postgresql: 5432
+  readReplicas:
+    service:
+      ports:
+        postgresql: 5432
 
 ## Nginx proxy is used to keep puma from having to serve static assets
 ## and to act as an auth proxy for Cantelope
@@ -391,14 +397,15 @@ nginx:
 
 redis:
   enabled: true
-  password: mysecret
+  auth:
+    password: mysecret
 
 solr:
   enabled: true
   image:
     repository: bitnami/solr
     tag: 8.11.1
-  authentication:
+  auth:
     enabled: true
     adminUsername: admin
     adminPassword: admin

data/config/locales/hyrax.de.yml

@@ -589,7 +589,7 @@ de:
         depositor: Deponent
         directions: Unabhängig von den Sichtbarkeitseinstellungen für diese Arbeit können Sie sie auch für andere Benutzer und Gruppen freigeben.
         group: Gruppe
-        permissions_save_note_html: Berechtigungen werden <strong> nicht </ strong> gespeichert, bis die Option & quot; Speichern & quot; Die Taste wird unten auf der Seite gedrückt.
+        permissions_save_note_html: Berechtigungen werden <strong> nicht </strong> gespeichert, bis die Option & quot; Speichern & quot; Die Taste wird unten auf der Seite gedrückt.
         use_add_button: Verwenden Sie die Schaltfläche "Hinzufügen", um Zugriff auf jeweils eine %{account_label} zu gewähren (diese wird der folgenden Liste hinzugefügt). Wählen Sie den Benutzer nach Name oder %{account_label} \ aus. Wählen Sie dann die Zugriffsebene aus, die Sie gewähren möchten, und klicken Sie auf Add this %{account_label}, um das Hinzufügen der Berechtigung abzuschließen.
       form_thumbnail:
         help_html: Wählen Sie die Datei aus, die als Miniaturansicht für diese Arbeit verwendet werden soll.
@@ -1405,14 +1405,14 @@ de:
       count:
         collections:
           collections_listing: Auflistung der Sammlungen
-          in_repo: "<strong> %{total_count} Sammlungen </ strong> im Repository"
-          you_manage: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository verwalten können"
-          you_own: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository besitzen"
+          in_repo: "<strong> %{total_count} Sammlungen </strong> im Repository"
+          you_manage: "<strong> %{total_count} Sammlungen </strong>, die Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Sammlungen </strong>, die Sie im Repository besitzen"
         works:
-          in_repo: "<strong> %{total_count} Arbeiten </ strong> im Repository"
+          in_repo: "<strong> %{total_count} Arbeiten </strong> im Repository"
           works_listing: Auflistung der Arbeiten
-          you_manage: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository verwalten können"
-          you_own: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository besitzen"
+          you_manage: "<strong> %{total_count} Arbeiten </strong>, das Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Arbeiten </strong>, das Sie im Repository besitzen"
       sort_and_per_page:
         number_of_results_to_display_per_page: Anzahl der anzuzeigenden Ergebnisse pro Seite
     nav_safety:

data/config/locales/hyrax.es.yml

@@ -1412,14 +1412,14 @@ es:
       count:
         collections:
           collections_listing: Listado de colecciones
-          in_repo: "<strong> colecciones %{total_count} </ strong> en el repositorio"
-          you_manage: "<strong> colecciones %{total_count} </ strong> puede administrar en el repositorio"
-          you_own: "<strong> colecciones %{total_count} </ strong> que posee en el repositorio"
+          in_repo: "<strong> colecciones %{total_count} </strong> en el repositorio"
+          you_manage: "<strong> colecciones %{total_count} </strong> puede administrar en el repositorio"
+          you_own: "<strong> colecciones %{total_count} </strong> que posee en el repositorio"
         works:
-          in_repo: "<strong> %{total_count} funciona </ strong> en el repositorio"
+          in_repo: "<strong> %{total_count} funciona </strong> en el repositorio"
           works_listing: Listado de obras
-          you_manage: "<strong> %{total_count} funciona </ strong> puedes administrar en el repositorio"
-          you_own: "<strong> %{total_count} funciona </ strong> en el repositorio"
+          you_manage: "<strong> %{total_count} funciona </strong> puedes administrar en el repositorio"
+          you_own: "<strong> %{total_count} funciona </strong> en el repositorio"
       sort_and_per_page:
         number_of_results_to_display_per_page: Número de resultados a mostrar por página
     nav_safety:
@@ -1840,4 +1840,4 @@ es:
       html: <span class="badge badge-info required-tag">obligatorio</span>
   total_view:
     one: Este trabajo tiene 1 vista total
-    other: Este trabajo tiene un total de %{count} visualizaciones
+    other: Este trabajo tiene un total de %{count} visualizaciones