From b5cb1461def0cd27f5859a07123e537242f35312 Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Thu, 26 Oct 2023 08:21:47 +0200 Subject: [PATCH 1/3] Changes workflow related translations Will change some keys such that :title_assignment, :title_start, :title_approval to make the dialog less mistakable. --- config/locales/de.yml | 4 ++-- config/locales/en.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 1ffa24f7..1b0179e2 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -252,8 +252,8 @@ de: title_none: Kein Workflow title_rejection: Ablehnung title_delegation: Delegierung - title_assignment: Workflow starten - title_start: Start + title_assignment: Workflow zuordnen + title_start: Workflow starten title_dmsf_workflow_log: Genehmigungs-Workflow Verlauf title_assigned: Zugewiesen title_approval: Genehmigt diff --git a/config/locales/en.yml b/config/locales/en.yml index 18cdfa00..852a4048 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -255,11 +255,11 @@ en: title_none: None title_rejection: Rejection title_delegation: Delegation - title_assignment: Assignment - title_start: Start + title_assignment: Assign workflow + title_start: Start workflow title_dmsf_workflow_log: Approval Workflow Log title_assigned: Assigned - title_approval: Approval + title_approval: Approved title_rejected: Rejected title_obsolete: Obsolete dmsf_and: AND From 171d2aa2beca1c70fc5f269557717861f415c5fc Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Thu, 26 Oct 2023 08:33:09 +0200 Subject: [PATCH 2/3] Deletes needless closing erb bracket In DMS file context menu there is a redundant closing erb bracket (%>) which breaks the li item in the menu. --- app/views/dmsf_context_menus/_file.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dmsf_context_menus/_file.html.erb b/app/views/dmsf_context_menus/_file.html.erb index f3db389e..31d44767 100644 --- a/app/views/dmsf_context_menus/_file.html.erb +++ b/app/views/dmsf_context_menus/_file.html.erb @@ -29,7 +29,7 @@ <%= context_menu_link "#{l(:button_copy)}/#{l(:button_move)}", copymove_entries_path(id: project, folder_id: folder, ids: ["file-#{dmsf_file.id}"], back_url: back_url), title: l(:title_copy), class: 'icon icon-copy', - data: { cy: "icon__copy--dmsf_file_#{dmsf_file.id}" } %> %> + data: { cy: "icon__copy--dmsf_file_#{dmsf_file.id}" } %>
  • <%= link_to l(:label_link_to), From 8946ad97ec64093da35db94a18e0e74f2d350172 Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Thu, 26 Oct 2023 14:01:15 +0200 Subject: [PATCH 3/3] Changes title_approval translation The English translation "Approve document" fits better in the workflow steps than "Approval" only: 1. "Assign workflow" 2. "Start workflow" 3. "Approve document" (Approve x Reject x Delegate) 4. "" (As soon as the workflow is finished, there is no item related to the workflow in the menu.) The German translation is modified accordingly. --- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 1b0179e2..2c9d0046 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -256,7 +256,7 @@ de: title_start: Workflow starten title_dmsf_workflow_log: Genehmigungs-Workflow Verlauf title_assigned: Zugewiesen - title_approval: Genehmigt + title_approval: Dokument genehmigen title_rejected: Abgelehnt title_obsolete: Veraltet dmsf_and: UND diff --git a/config/locales/en.yml b/config/locales/en.yml index 852a4048..57faf9a9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -259,7 +259,7 @@ en: title_start: Start workflow title_dmsf_workflow_log: Approval Workflow Log title_assigned: Assigned - title_approval: Approved + title_approval: Approve document title_rejected: Rejected title_obsolete: Obsolete dmsf_and: AND