diff --git a/config/locales/cs.yml b/config/locales/cs.yml index fdfed8fe..65cfdc8a 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -278,8 +278,6 @@ cs: text_email_to_proceed: Pro schválení klikněte na zaškrtávací ikonku vedle dokumentu v text_email_to_see_history: Pro zobrazení historie schvalovacího procesu klikněte na status dokumentu v text_email_to_see_status: Pro zobrazení aktuálního stavu schvalovacího procesu klikněte na status dokumentu v - label_my_open_approvals: My open approvals - label_my_locked_documents: My locked documents title_create_link: Vytvořit symbolický odkaz label_link_from: Odkaz z diff --git a/config/locales/de.yml b/config/locales/de.yml index 7a13db07..70ffa62c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -278,8 +278,6 @@ de: text_email_to_proceed: Um fortzufahren klicke auf das Häckchen neben der Datei in text_email_to_see_history: Um den Verlauf des Genehmigungs-Workflows zu sehen klicke auf den Workflowstatus zur Datei in text_email_to_see_status: Um den aktuellen Status des Genehmigungs-Workflows zu sehen klicke auf den Workflowstatus zur Datei in - label_my_open_approvals: Meine offenen Genehmigungen - label_my_locked_documents: Meine geschlossenen Genehmigungen title_create_link: Verknüpfung anlegen label_link_from: Verlinke von diff --git a/config/locales/en.yml b/config/locales/en.yml index 9722dcc2..cf5775db 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -278,8 +278,6 @@ en: text_email_to_proceed: To proceed click on the check box icon next to the document in text_email_to_see_history: To see the approval history click on the workflow status of the document in text_email_to_see_status: To see the current status of the approval workflow click on the workflow status the document in - label_my_open_approvals: My open approvals - label_my_locked_documents: My locked documents title_create_link: Create a symbolic link label_link_from: Link from diff --git a/config/locales/es.yml b/config/locales/es.yml index faa35823..a7f46be3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -278,8 +278,6 @@ es: text_email_to_proceed: "Para continuar, haga clic en el icono de la casilla de verificación al lado del documento" text_email_to_see_history: "Para ver el historial de aprobación haga clic en el estado del flujo de trabajo del documento" text_email_to_see_status: "Para ver el estado actual del flujo de trabajo de aprobación, haga clic en el estado del flujo de trabajo del documento" - label_my_open_approvals: Mis aprobaciones abiertas - label_my_locked_documents: Mis documentos bloqueados title_create_link: "Crear un enlace simbólico" label_link_from: Enlace desde diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0132ed4c..e30b62a7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -278,8 +278,6 @@ fr: text_email_to_proceed: "Pour ce faire, cliquez sur l'icône de validation à côté du document dans" text_email_to_see_history: "Pour consulter l'historique de validation, cliquez sur le statut du flux du document dans" text_email_to_see_status: Pour consulter le statut actuel du flux de validation, cliquez sur le statut du flux du document dans - label_my_open_approvals: Mes approbations en attente - label_my_locked_documents: Mes documents verrouillés title_create_link: Créer un lien symbolique label_link_from: Lien depuis diff --git a/config/locales/it.yml b/config/locales/it.yml index 34c3a8b4..2c1a7d4f 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -278,8 +278,6 @@ it: # Italian strings thx 2 Matteo Arceci! text_email_to_proceed: Per proseguire clicca sull'icona checkbox a fianco del documento text_email_to_see_history: Per vedere la storia di approvazione clicca sullo stato del flusso di lavoro del documento text_email_to_see_status: Per vedere lo stato attuale del flusso di lavoro di approvazione clicca sullo stato del flusso di lavoro del documento - label_my_open_approvals: Le mie approvazioni aperte - label_my_locked_documents: I miei documenti bloccati title_create_link: Crea un collegamento label_link_from: Collegamento da diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5ae5ccf4..1273553f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -278,8 +278,6 @@ ja: text_email_to_proceed: 次のURLを開き内容を確認の上、右端のチェックマークをクリックし承認・否認の選択をしてください。 text_email_to_see_history: 次のURLで承認ワークフローの履歴を確認することができます。 text_email_to_see_status: 次のURLで承認ワークフローのステータスを確認することができます。 - label_my_open_approvals: 自分の承認待ち - label_my_locked_documents: 自分のロック中ファイル title_create_link: シンボリックリンクを作成します label_link_from: リンク生成(from) diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 3e8b56b6..7e103122 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -278,8 +278,6 @@ pl: text_email_to_proceed: Aby procedować zaznacz check box przy dokumencie text_email_to_see_history: Aby zobaczyć historię akceptacji kliknij w proces akceptacji dokumentu text_email_to_see_status: Aby zobaczyć aktualny stan procesu akceptacji kliknij w proces akceptacji dokumentu - label_my_open_approvals: Otwarte akceptacje - label_my_locked_documents: Zablokowane dokumenty title_create_link: Utwórz symbolic link label_link_from: Odnośnik z diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index a436ba1a..6f911cc6 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -278,8 +278,6 @@ pt-BR: text_email_to_proceed: Para dar continuidade ao fluxo, clique no íncone ao lado do documento text_email_to_see_history: Para visualizar o histórico de workflow de aprovação clique no status do workflow disponível ao lado do documento text_email_to_see_status: Para visualizar o status atual do workflow de aprovação, clique no status de fluxo de trabalho do documento - label_my_open_approvals: Minhas aprovações abertas - label_my_locked_documents: Meus documentos bloqueados title_create_link: Create a symbolic link label_link_from: Link from diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e282cf65..f65d6f78 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -278,8 +278,6 @@ ru: text_email_to_proceed: Для продолжения поставьте отметку рядом с документом в text_email_to_see_history: Для просмотра истории согласования нажмите статус согласования документа в text_email_to_see_status: Для просмотра текущего статуса согласования нажмите статус согласования документа в - label_my_open_approvals: Мои согласования - label_my_locked_documents: Мои заблокированные документы title_create_link: Создать символическую ссылку label_link_from: Ссылка из diff --git a/config/locales/sl.yml b/config/locales/sl.yml index cf71701b..56f0b7cb 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -278,8 +278,6 @@ sl: text_email_to_proceed: To proceed click on the check box icon next to the document in text_email_to_see_history: To see the approval history click on the workflow status of the document in text_email_to_see_status: To see the current status of the approval workflow click on the workflow status the document in - label_my_open_approvals: My open approvals - label_my_locked_documents: My locked documents title_create_link: Create a symbolic link label_link_from: Link from diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 002c846b..8b6e3ec1 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -278,8 +278,6 @@ zh-TW: text_email_to_proceed: To proceed click on the check box icon next to the document in text_email_to_see_history: To see the approval history click on the workflow status of the document in text_email_to_see_status: To see the current status of the approval workflow click on the workflow status the document in - label_my_open_approvals: My open approvals - label_my_locked_documents: My locked documents title_create_link: Create a symbolic link label_link_from: Link from diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d5aac430..eedb89df 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -278,8 +278,6 @@ zh: text_email_to_proceed: To proceed click on the check box icon next to the document in text_email_to_see_history: To see the approval history click on the workflow status of the document in text_email_to_see_status: To see the current status of the approval workflow click on the workflow status the document in - label_my_open_approvals: My open approvals - label_my_locked_documents: My locked documents title_create_link: Create a symbolic link label_link_from: Link from diff --git a/test/functional/dmsf_workflow_controller_test.rb b/test/functional/dmsf_workflow_controller_test.rb index 07e3360c..5a7d391d 100644 --- a/test/functional/dmsf_workflow_controller_test.rb +++ b/test/functional/dmsf_workflow_controller_test.rb @@ -217,7 +217,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase end def test_reorder_steps_to_lower - put :reorder_steps, :step => 1, :id => @wf1.id, :workflow_step => {:move_to => 'lower'} + put :reorder_steps, :step => 1, :id => @wf1.id, :dmsf_workflow => {:position => 2} assert_response :success @wfs1.reload @wfs2.reload @@ -232,7 +232,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase end def test_reorder_steps_to_lowest - put :reorder_steps, :step => 1, :id => @wf1.id, :workflow_step => {:move_to => 'lowest'} + put :reorder_steps, :step => 1, :id => @wf1.id, :dmsf_workflow => {:position => 3} assert_response :success @wfs1.reload @wfs2.reload @@ -247,7 +247,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase end def test_reorder_steps_to_higher - put :reorder_steps, :step => 3, :id => @wf1.id, :workflow_step => {:move_to => 'higher'} + put :reorder_steps, :step => 3, :id => @wf1.id, :dmsf_workflow => {:position => 2} assert_response :success @wfs1.reload @wfs2.reload @@ -262,7 +262,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase end def test_reorder_steps_to_highest - put :reorder_steps, :step => 3, :id => @wf1.id, :workflow_step => {:move_to => 'highest'} + put :reorder_steps, :step => 3, :id => @wf1.id, :dmsf_workflow => {:position => '1'} assert_response :success @wfs1.reload @wfs2.reload diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index 7d7e1d5c..4309988f 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -44,7 +44,7 @@ class MyControllerTest < RedmineDmsf::Test::TestCase get :page assert_response :success assert_select 'div#list-top' do - assert_select 'h3', { :text => "#{l(:label_my_open_approvals)} (0)" } + assert_select 'h3', { :text => "#{l(:open_approvals)} (0)" } end end @@ -54,7 +54,7 @@ class MyControllerTest < RedmineDmsf::Test::TestCase get :page assert_response :success assert_select 'div#list-top' do - assert_select 'h3', { :text => "#{l(:label_my_locked_documents)} (0/1)" } + assert_select 'h3', { :text => "#{l(:locked_documents)} (0/1)" } end end