From 7fbe3e29d60e29559ae011b269a26895635fbd6c Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Fri, 3 Jan 2014 11:57:38 +0100 Subject: [PATCH] Approval workflow log view texts changed --- app/views/dmsf_files/show.html.erb | 2 +- app/views/dmsf_workflows/_assign.html.erb | 2 +- app/views/dmsf_workflows/_log.html.erb | 14 ++++++-------- config/locales/cs.yml | 3 +-- config/locales/de.yml | 3 +-- config/locales/en.yml | 5 ++--- config/locales/es.yml | 3 +-- config/locales/fr.yml | 3 +-- config/locales/ja.yml | 3 +-- config/locales/ru.yml | 3 +-- config/locales/sl.yml | 3 +-- config/locales/zh.yml | 3 +-- 12 files changed, 18 insertions(+), 29 deletions(-) diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index 8bec7c8d..4fb3a12b 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -110,7 +110,7 @@ <%= label_tag('', "#{l(:label_version)}:") %> <%= revision.major_version %>.<%= revision.minor_version %>
- <%= label_tag('', "#{l(:label_workflow)}:") %> + <%= label_tag('', "#{l(:link_workflow)}:") %> <% wf = DmsfWorkflow.find_by_id(revision.dmsf_workflow_id) %> <% if wf %> <%= "#{wf.name} - " %> diff --git a/app/views/dmsf_workflows/_assign.html.erb b/app/views/dmsf_workflows/_assign.html.erb index 995e973f..4a47bdc8 100644 --- a/app/views/dmsf_workflows/_assign.html.erb +++ b/app/views/dmsf_workflows/_assign.html.erb @@ -22,7 +22,7 @@ :id => 'assignment-form') do %> <%= hidden_field_tag :dmsf_file_revision_id, params[:dmsf_file_revision_id] %>

- <%= label_tag('workflow', l(:label_workflow) + ':') %> + <%= label_tag('workflow', "#{l(:link_workflow)}:") %> <%= select_tag( 'dmsf_workflow_id', dmsf_workflows_for_select(@project, nil))%> diff --git a/app/views/dmsf_workflows/_log.html.erb b/app/views/dmsf_workflows/_log.html.erb index ced27049..0a4d435c 100644 --- a/app/views/dmsf_workflows/_log.html.erb +++ b/app/views/dmsf_workflows/_log.html.erb @@ -37,9 +37,9 @@ <%= l(:label_dmsf_workflow_step) %> <%= l(:label_user) %> <%= l(:label_action) %> - <%= l(:label_workflow) %> + <%= l(:link_workflow) %> <%= l(:label_note) %> - <%= l(:label_date)%> + <%= l(:label_date)%> @@ -53,7 +53,7 @@ <%= link_to_user User.find_by_id(revision.dmsf_workflow_assigned_by) if revision.dmsf_workflow_assigned_by %> - <%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %> + <%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %> <%= DmsfWorkflowStepAction.workflow_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %> <%= format_time(revision.dmsf_workflow_assigned_at) if revision.dmsf_workflow_assigned_at %> @@ -61,7 +61,7 @@ <%= link_to_user User.find_by_id(revision.dmsf_workflow_started_by) if revision.dmsf_workflow_started_by %> - <%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_START) %> + <%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_START) %> <%= DmsfWorkflowStepAction.workflow_str(DmsfWorkflowStepAction::ACTION_START) if revision.dmsf_workflow_started_by %> <%= format_time(revision.dmsf_workflow_started_at) if revision.dmsf_workflow_started_at %> @@ -73,10 +73,8 @@ <%= row[5] %> <%= link_to_user User.find_by_id(row[3].present? ? row[3] : row[4]) %> <%= DmsfWorkflowStepAction.action_str(row[0]) %> - - <% s = @workflow.dmsf_workflow_steps.last.step %> - <% s1 = row[5] %> - <% if((row[5].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED)) %> + + <% if((row[5].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row[0] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %> <%= l(:title_approved) %> <% else %> <%= DmsfWorkflowStepAction.workflow_str(row[0]) %> diff --git a/config/locales/cs.yml b/config/locales/cs.yml index ff59de4f..4ca60167 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -111,8 +111,7 @@ cs: label_changed: Změněno info_changed_by_user: "%{changed} uživatelem" label_filename: Jméno souboru - label_version: Verze - label_workflow: Workflow + label_version: Verze label_mime: Typ label_size: Velikost label_comment: Komentář diff --git a/config/locales/de.yml b/config/locales/de.yml index 830def49..b430fdba 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -111,8 +111,7 @@ de: label_changed: Geändert info_changed_by_user: "%{changed} von" label_filename: Dateiname - label_version: Version - label_workflow: Workflow + label_version: Version label_mime: Mime label_size: Größe label_comment: Kommentar diff --git a/config/locales/en.yml b/config/locales/en.yml index 656414c2..406ca7af 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -113,7 +113,7 @@ en: info_changed_by_user: "%{changed} by" label_filename: Filename label_version: Version - label_workflow: Workflow + label_approval_workflow: Workflow label_mime: Mime label_size: Size label_comment: Comment @@ -258,8 +258,7 @@ en: dmsf_or: OR dmsf_new_step: New step message_dmsf_wokflow_note: Your note... - info_revision: "r%{rev}" - link_workflow: Workflow + info_revision: "r%{rev}" notice_workflow_started: Approval workflow successfully started text_email_subject_approved: "Approval workflow %{name} approved" text_email_subject_rejected: "Approval workflow %{name} rejected" diff --git a/config/locales/es.yml b/config/locales/es.yml index 93e35c7c..3c175dad 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -112,8 +112,7 @@ es: label_changed: Changed info_changed_by_user: "%{changed} by" label_filename: Filename - label_version: Version - label_workflow: Workflow + label_version: Version label_mime: Mime label_size: Size label_comment: Comment diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f534e193..51c3c1b8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -110,8 +110,7 @@ fr: label_changed: Modifié info_changed_by_user: "%{changed} par" label_filename: Fichier - label_version: Version - label_workflow: Etat + label_version: Version label_mime: Type label_size: Taille label_comment: Commentaires diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 542acb98..15147867 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -110,8 +110,7 @@ ja: label_changed: 更新者/日時 info_changed_by_user: "/ %{changed}" label_filename: ファイル名 - label_version: バージョン - label_workflow: ワークフロー + label_version: バージョン label_mime: Mime label_size: サイズ label_comment: コメント diff --git a/config/locales/ru.yml b/config/locales/ru.yml index b1512595..44f6c294 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -110,8 +110,7 @@ ru: label_changed: Изменен info_changed_by_user: "%{changed} пользователем" label_filename: Имя файла - label_version: Версия - label_workflow: Поток работ + label_version: Версия label_mime: MIME-тип label_size: Размер label_comment: Комментарий diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 34af6ac8..411eb6c6 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -110,8 +110,7 @@ sl: label_changed: Spremenjeno info_changed_by_user: "%{changed} po" label_filename: Datoteka - label_version: Verzija - label_workflow: postopek + label_version: Verzija label_mime: Mime label_size: Velikost label_comment: Komentar diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 08127eeb..15f50358 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -110,8 +110,7 @@ zh: label_changed: 修改 info_changed_by_user: "%{changed} by" label_filename: 文件名 - label_version: 版本 - label_workflow: 工作流程 + label_version: 版本 label_mime: Mime label_size: 大小 label_comment: 注释