iqvoc 4.13.2 → 4.14.5

data/app/views/search_results/_form.html.erb

@@ -1,10 +1,22 @@
-<%= form_tag(search_path, method: :get, id:'search', role: 'form', class: 'mb-4') do |f| %>
-  <% Iqvoc.search_sections.each do |section| %>
-    <%= render "search_results/sections/#{section}" %>
-  <% end %>
-
-  <hr />
-
-  <%= submit_tag t('txt.views.search_results.submit'), :class => 'btn btn-primary' %>
-
+<%= form_tag(search_path, method: :get, id: 'search', role: 'form', class: 'mt-3 mb-4') do |f| %>
+  <div class="row">
+    <div class="col">
+      <%= render "search_results/sections/terms" %>
+    </div>
+  </div>
+  <div class="row justify-content-between">
+    <div class="col">
+      <%= render "search_results/sections/languages" %>
+    </div>
+    <div class="col-auto">
+      <button class="btn btn-outline-secondary collapse-toggle" data-toggle="collapse" data-target="#detailedSearch" type="button" aria-expanded="false" aria-controls="detailedSearch">
+        <span class="mr-2"><%= t('txt.views.search_results.detailed_search') %></span>
+        <i class="hide-if-expanded fa fa-chevron-down"></i>
+        <i class="hide-if-collapsed fa fa-chevron-up"></i>
+      </button>
+    </div>
+  </div>
+  <div id="detailedSearch" class="collapse <%= current_user ? 'show' : ''%>">
+    <%= render 'detailed_search' %>
+  </div>
 <% end %>

data/app/views/search_results/index.html.erb

@@ -4,9 +4,9 @@
 <%= render 'form' %>
 
 <% if @results %>
-<div class="panel">
-  <%= results_header @results %>
+  <div class="panel">
+    <%= results_header @results %>
     <%= render 'result_list' %>
-  <%= paginate @results %>
-</div>
+    <%= paginate @results %>
+  </div>
 <% end %>

data/app/views/search_results/sections/_change_note.html.erb

@@ -1,28 +1,31 @@
-<div class="form-group row">
-  <label class="col-sm-2 col-form-label">
-    <%= t('txt.views.search_results.change_note.date') %>
-  </label>
-
-  <div class="col-sm-10">
-    <div class="form-inline">
-      <label for="change_note_type" class="sr-only"><%= t('txt.views.search_results.change_note.type') %></label>
-      <%= select_tag :change_note_type, options_for_select([[t('txt.views.search_results.change_note.created'), :created], [t('txt.views.search_results.change_note.modified'), :modified]], params[:change_note_type]), :prompt => t('txt.views.search_results.all'), class: 'form-control col-sm-3' %>
-
-      <div class="input-group date datepicker">
-        <label for="change_note_date_from" class="sr-only"><%= t('txt.views.search_results.change_note.date_from') %></label>
-        <%= text_field_tag :change_note_date_from, params[:change_note_date_from], placeholder: 'z.B.: 2010-05-14', class: 'form-control', style: 'border-radius: 4px 0px 0px 4px;' %>
-        <div class="input-group-append">
-          <span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
-        </div>
-      </div>
-
-      <div class="input-group date datepicker">
-        <label for="change_note_date_to" class="sr-only"><%= t('txt.views.search_results.change_note.date_to') %></label>
-        <%= text_field_tag :change_note_date_to, params[:change_note_date_to], placeholder: 'z.B.: 2010-05-14', class: 'form-control', style: 'border-radius: 4px 0px 0px 4px;' %>
-        <div class="input-group-append">
-          <span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
-        </div>
-      </div>
+<div class="form-group col-md-6">
+  <%= label_tag :change_note_type, t('txt.views.search_results.change_note.date') %>
+  <%= select_tag :change_note_type,
+                 options_for_select([[t('txt.views.search_results.change_note.created'), :created], [t('txt.views.search_results.change_note.modified'), :modified]], params[:change_note_type]),
+                 :prompt => t('txt.views.search_results.change_note.all'),
+                 class: 'form-control' %>
+</div>
+<div class="col-md-3">
+  <%= label_tag :change_note_date_from, t('txt.views.search_results.change_note.date_from') %>
+  <div class="input-group date datepicker">
+    <%= text_field_tag :change_note_date_from, params[:change_note_date_from],
+                       placeholder: 'z.B.: 2010-05-14',
+                       class: 'form-control',
+                       style: 'border-radius: 4px 0px 0px 4px;' %>
+    <div class="input-group-append">
+      <span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
+    </div>
+  </div>
+</div>
+<div class="col-md-3">
+  <%= label_tag :change_note_date_to, t('txt.views.search_results.change_note.date_to') %>
+  <div class="input-group date datepicker">
+    <%= text_field_tag :change_note_date_to, params[:change_note_date_to],
+                       placeholder: 'z.B.: 2010-05-14',
+                       class: 'form-control',
+                       style: 'border-radius: 4px 0px 0px 4px;' %>
+    <div class="input-group-append">
+      <span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
     </div>
   </div>
 </div>

data/app/views/search_results/sections/_collection.html.erb

@@ -1,6 +1,6 @@
-<div class="form-group row result_type_filter">
-  <%= label_tag 'c', Iqvoc::Collection.base_class.model_name.human, :class => 'col-sm-2 col-form-label' %>
-  <div class="col-sm-4">
-    <%= select_tag 'c', options_from_collection_for_select(@collections, 'origin', 'status', params[:c]), :class => 'form-control', :prompt => t('txt.views.search_results.all') %>
-  </div>
+<div class="form-group result_type_filter">
+  <%= label_tag 'c', Iqvoc::Collection.base_class.model_name.human %>
+  <%= select_tag 'c', options_from_collection_for_select(@collections, 'origin', 'status', params[:c]),
+                 :class => 'form-control',
+                 :prompt => t('txt.views.search_results.all') %>
 </div>

data/app/views/search_results/sections/_datasets.html.erb

@@ -1,23 +1,11 @@
 <% if @datasets.any? %>
-  <div class="form-group row">
-    <%= label_tag 'ds', t('txt.views.search_results.datasets'), :class => 'col-sm-2 col-form-label' %>
-    <div class="checkbox-controls col-sm-6">
-      <% @datasets.each do |dataset| %>
-      <div class="form-check form-check-inline">
-        <label class="checkbox-inline">
-          <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name),  class: 'form-check-input' %>
-          <%= dataset.name %>
-        </label>
+  <div class="form-group">
+    <%= label_tag 'ds', t('txt.views.search_results.datasets') %>
+    <% @datasets.each_with_index do |dataset, idx| %>
+      <div class="form-check">
+        <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name), class: 'form-check-input', id: "datasets_#{idx}" %>
+        <%= label_tag "datasets_#{idx}", dataset.name, class: 'form-check-label' %>
       </div>
-      <% end %>
-      <div class="btn-group btn-group-sm">
-        <button type="button" class="btn btn-outline-secondary checkbox-select-all">
-          <%= t('txt.views.search_results.all') %>
-        </button>
-        <button type="button" class="btn btn-outline-secondary checkbox-select-none">
-          <%= t('txt.views.search_results.none') %>
-        </button>
-      </div>
-    </div>
+    <% end %>
   </div>
-<% end %>
+<% end %>

data/app/views/search_results/sections/_klass.html.erb

@@ -1,10 +1,8 @@
-<div class="form-group row">
-  <%= label_tag 't', t('txt.views.search_results.for'), :class => 'col-sm-2 col-form-label' %>
-  <div class="col-sm-3">
-    <select name="t" id="t" class="search_type form-control">
-      <%= options_for_select(Iqvoc.searchable_class_names.map { |klass, identifier|
-          [klass.constantize.model_name.human(:count => 2), identifier]
-        }, params[:t]) %>
-    </select>
-  </div>
+<div class="form-group">
+  <%= label_tag 't', t('txt.views.search_results.for') %>
+  <select name="t" id="t" class="form-control">
+    <%= options_for_select(Iqvoc.searchable_class_names.map { |klass, identifier|
+      [klass.constantize.model_name.human(:count => 2), identifier]
+    }, params[:t]) %>
+  </select>
 </div>

data/app/views/search_results/sections/_languages.html.erb

@@ -1,21 +1,11 @@
 <div class="form-group row">
-  <%= label_tag 'ds', t('txt.views.search_results.language'), :class => 'col-sm-2 col-form-label' %>
-  <div class="checkbox-controls col-sm-4">
+  <%= label_tag 'ds', t('txt.views.search_results.language'), class: 'col-auto' %>
+  <div class="checkbox-controls col">
     <% @available_languages.sort.each do |lang_tag, label| %>
       <div class="form-check form-check-inline">
-        <label for="languages_<%= lang_tag %>" class="form-check-label">
-          <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag), class: 'form-check-input', id: "languages_#{lang_tag}" %>
-          <%= lang_tag %>
-        </label>
+        <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag), class: 'form-check-input', id: "languages_#{lang_tag}" %>
+        <%= label_tag "languages_#{lang_tag}", lang_tag, class: 'form-check-label' %>
       </div>
     <% end %>
-    <div class="btn-group btn-group-sm">
-      <button type="button" class="btn btn-outline-secondary checkbox-select-all">
-        <%= t('txt.views.search_results.all') %>
-      </button>
-      <button type="button" class="btn btn-outline-secondary checkbox-select-none">
-        <%= t('txt.views.search_results.none') %>
-      </button>
-    </div>
   </div>
 </div>

data/app/views/search_results/sections/_mode.html.erb

@@ -1,11 +1,9 @@
-<div class="form-group row">
-  <%= label_tag 'qt', t('txt.views.search_results.mode'), :class => 'col-sm-2 col-form-label' %>
-  <div class="col-sm-3">
-    <%= select_tag :qt, options_for_select([
-        [t('txt.views.search_results.contains'), 'contains'],
-        [t('txt.views.search_results.exact'), 'exact'],
-        [t('txt.views.search_results.ends_with'), 'ends_with'],
-        [t('txt.views.search_results.begins_with'), 'begins_with']
-      ], params[:qt]), :class => 'form-control' %>
-  </div>
+<div class="form-group">
+  <%= label_tag :qt, t('txt.views.search_results.mode') %>
+  <%= select_tag :qt, options_for_select([
+                                           [t('txt.views.search_results.contains'), 'contains'],
+                                           [t('txt.views.search_results.exact'), 'exact'],
+                                           [t('txt.views.search_results.ends_with'), 'ends_with'],
+                                           [t('txt.views.search_results.begins_with'), 'begins_with']
+                                         ], params[:qt]), :class => 'form-control' %>
 </div>

data/app/views/search_results/sections/_options.html.erb

@@ -1,10 +1,8 @@
-<div class="form-group row result_type_filter">
-  <div class="col-sm-8 offset-sm-2">
-    <div class="form-check form-check-inline">
-      <label for="include_expired" class="form-check-label">
-        <%= check_box_tag :include_expired, true, params[:include_expired] == true, class: 'form-check-input' %>
-        <%= t('txt.views.search_results.expired') %>
-      </label>
-    </div>
+<div class="form-group result_type_filter">
+  <div class="form-check form-check-inline">
+    <label for="include_expired" class="form-check-label">
+      <%= check_box_tag :include_expired, true, params[:include_expired] == true, class: 'form-check-input' %>
+      <%= t('txt.views.search_results.expired') %>
+    </label>
   </div>
 </div>

data/app/views/search_results/sections/_terms.html.erb

@@ -1,12 +1,15 @@
-<div class="form-group has-feedback row">
-  <%= label_tag 'q', t('txt.views.search_results.search_term'), :class => 'col-sm-2 col-form-label' %>
-  <div class="col-sm-6">
-    <div class="input-group">
-      <% if Iqvoc.searchable_class_names.key(params[:t]).constantize.supports_multi_query? %>
-        <%= text_area_tag :q, params[:query], :class => 'form-control', autofocus: true %>
-      <% else %>
-        <%= text_field_tag :q, params[:query], :class => 'form-control', autofocus: true, autocomplete: 'off'  %>
-      <% end %>
-      </div>
+<div class="form-group row no-gutters align-items-center bg-white search-input">
+  <div class="col-auto">
+    <i class="fa fa-search fa-lg"></i>
+  </div>
+  <div class="col">
+    <%= search_field_tag :q, params[:query],
+                         class: 'form-control form-control-lg form-control-borderless border-0',
+                         placeholder: t('txt.views.search_results.search_term'),
+                         autofocus: true,
+                         autocomplete: 'off' %>
+  </div>
+  <div class="col-auto">
+    <%= submit_tag t('txt.views.search_results.submit'), class: 'btn btn-block btn-lg btn-primary p-2' %>
   </div>
 </div>

data/app/views/search_results/sections/_type.html.erb

@@ -1,25 +1,25 @@
-<div class="form-group result_type_filter row">
-  <%= label_tag nil, t('txt.views.search_results.in'), :class => 'col-sm-2 col-form-label' %>
-  <div class="col-sm-4">
-    <div class="form-check">
+<div class="form-group row">
+  <div class="col-12">
+    <%= label_tag nil, t('txt.views.search_results.in') %>
+  </div>
+  <div class="col-12">
+    <div class="form-check form-check-inline">
+      <%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]), class: 'form-check-input' %>
+      <label for="for_all" class="form-check-label">
+        <%= t("txt.views.search_results.all") %>
+      </label>
+    </div>
+    <div class="form-check form-check-inline">
       <%= radio_button_tag 'for', 'concept', params[:for] == "concept", class: 'form-check-input' %>
       <label for="for_concept" class="form-check-label">
         <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %>
       </label>
     </div>
-
-    <div class="form-check">
+    <div class="form-check form-check-inline">
       <%= radio_button_tag 'for', 'collection', params[:for] == "collection", class: 'form-check-input' %>
       <label for="for_collection" class="form-check-label">
         <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %>
       </label>
     </div>
-
-    <div class="form-check">
-      <%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]), class: 'form-check-input' %>
-      <label for="for_all" class="form-check-label">
-        <%= t("txt.views.search_results.all") %>
-      </label>
-    </div>
   </div>
 </div>

data/config/application.rb

@@ -21,7 +21,7 @@ Bundler.require(*Rails.groups)
 module Iqvoc
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
     #

data/config/boot.rb

@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "bundler/setup" # Set up gems listed in the Gemfile.
 require "bootsnap/setup" # Speed up boot time by caching expensive operations.

data/config/database.yml

@@ -1,20 +1,26 @@
-default: &default
-  adapter: postgresql
-  encoding: utf8
-  host: <%= ENV['DB_HOST'] || 'localhost' %>
-  username: <%= ENV['DB_USERNAME'] || 'mjansing' %>
-  password: <%= ENV['DB_PASSWORD'] || '' %>
-  port: 5432
-  pool: <%= ENV["DB_POOL"] || ENV['RAILS_MAX_THREADS'] || 5 %>
-
 development:
-  <<: *default
-  database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_development' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 test:
-  <<: *default
-  database: <%= ENV['DB_NAME'].presence || 'iqvoc_test' %>
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_test' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 production:
-  <<: *default
-  database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>
+  adapter: postgresql
+  host: <%= ENV["POSTGRES_HOST"] || 'localhost' %>
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_production' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>

data/config/database.yml.postgresql

@@ -18,7 +18,7 @@ test:
 
 production:
   adapter: postgresql
-  host: localhost
+  host: <%= ENV["POSTGRES_HOST"] || 'localhost' %>
   encoding: unicode
   database: <%= ENV["POSTGRES_DB"] || 'iqvoc_production' %>
   pool: 5

data/config/engine.rb

@@ -15,6 +15,7 @@ require 'apipie-rails'
 require 'database_cleaner'
 require 'delayed_job_active_record'
 require 'carrierwave'
+require 'carrierwave-i18n'
 require 'faraday'
 require 'faraday_middleware'
 require 'rack-mini-profiler'

data/config/initializers/active_record.rb

@@ -14,5 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'search_extension'
+
 ActiveRecord::Base.store_full_sti_class = true
 ActiveRecord::Base.send :include, SearchExtension

data/config/initializers/content_security_policy.rb

@@ -1,30 +1,25 @@
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-# Rails.application.config.content_security_policy do |policy|
-#   policy.default_src :self, :https
-#   policy.font_src    :self, :https, :data
-#   policy.img_src     :self, :https, :data
-#   policy.object_src  :none
-#   policy.script_src  :self, :https
-#   policy.style_src   :self, :https
-#   # If you are using webpack-dev-server then specify webpack-dev-server host
-#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
-
-#   # Specify URI for violation reports
-#   # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
 # end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true

data/config/initializers/filter_parameter_logging.rb

@@ -1,6 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :password, :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]

data/config/initializers/inflections.rb

@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end

data/config/initializers/iqvoc.rb

@@ -16,6 +16,7 @@
 
 require 'iqvoc'
 require 'iqvoc/version'
+require 'iqvoc_module_helper'
 
 ##### INSTANCE SETTINGS #####
 

data/config/locales/de.yml

@@ -75,7 +75,6 @@ de:
      of: von
      ops: Ups!
      pending: "Lade…"
-     translation_missing_for: "keine Übersetzung für"
      type_to_search: "Tippen um zu suchen"
      hint_csv_input: "Mehrere Werte können kommagetrennt eingeben werden."
      form_errors: "Fehler"
@@ -211,10 +210,10 @@ de:
      search_results:
        header: "Suche"
        inflectionals: "Schreibweisen"
-       contains: "enthält"
-       ends_with: "endet mit"
-       begins_with: "beginnt mit"
-       exact: "exakte Übereinstimmung"
+       contains: "enthalten Suchbegriff"
+       ends_with: "enden mit Suchbegriff"
+       begins_with: "starten mit Suchbegriff"
+       exact: "stimmen exakt mit Suchbegriff überein"
        regexp: "regulärer Ausdruck (fortgeschritten)"
        search_term: "Suchbegriff"
        note: mit Anmerkung
@@ -227,24 +226,26 @@ de:
          one: "Ihre Suche nach <strong>%{query}</strong> lieferte %{count} Ergebnis."
          other: "Ihre Suche nach <strong>%{query}</strong> lieferte %{count} Ergebnisse."
        no_results_found: "Ihre Suche lieferte keine Ergebnisse."
-       submit: "Suche"
+       submit: "Suchen"
+       detailed_search: "Detailsuche"
        type: "Typ"
        used_as: "benutzt als"
        expired: "stillgelegte einbeziehen?"
        language: "Sprache"
        all: "alle"
        none: "keine"
-       in: "In"
-       for: "Nach"
-       mode: "Modus"
+       in: "Suche umfasst"
+       for: "Suchen in"
+       mode: "Suchtreffer"
        datasets: "Externe Quellen"
        change_note:
+         all: "Erstellungs- oder Änderungsdatum"
          type: "Typ"
          created: 'Erstellungsdatum'
          modified: 'Änderungsdatum'
          date: "Datumsbereich"
-         date_from: 'von'
-         date_to: 'bis'
+         date_from: 'Von'
+         date_to: 'Bis'
      user_sessions:
        header: "Anmelden"
        login: "Anmelden"
@@ -290,7 +291,6 @@ de:
        delete_copy: "Kopie löschen"
        delete_confirm: "Kopie wirklich löschen?"
        versioning_mode: "Neue Version erstellen"
-       unlock: "Entsperren"
        preview_new_version: "Vorschau der Version in Bearbeitung"
        consistency_check: "Konsistenz prüfen"
        current_revision: "Aktuelle Revision %{rev}"
@@ -308,7 +308,6 @@ de:
      dashboard:
        type: "Typ"
        value: "Name"
-       locking_user: "Gesperrt"
        follow_up: "Wiedervorlage"
        updated_at: "Geändert am"
        to_review: "Vorlage zur Freigabe"
@@ -378,11 +377,7 @@ de:
        published_with_warning: "Instanz wurde erfolgreich veröffentlicht, hat aber keine Relationen zu anderen Instanzen."
        merged_delete_error: "Das alte Label konnte nicht gelöscht werden."
        merged_publishing_error: "Instanz konnte nicht veröffentlicht werden - bitte führen Sie eine Konsistenzprüfung durch."
-       branched: "Instanzkopie wurde erfolgreich angelegt und für andere Benutzer gesperrt."
-       locked: "Instanz wurde für andere User gesperrt."
-       lock_error: "Instanz ist bereits gesperrt."
-       unlocked: "Instanz wurde für andere User entsperrt."
-       unlock_error: "Instanz ist bereits entsperrt."
+       branched: "Instanzkopie wurde erfolgreich angelegt."
        new_version_blank_error: "Es existiert noch keine neue Version."
        delete: "Instanz löschen."
        consistency_check_success: "Instanz ist konsistent."