diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index 23ea817ac4..f39beef182 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -5,7 +5,7 @@
  • <%= context_menu_link l(:button_edit), edit_issue_path(@issue), :class => 'icon icon-edit', :disabled => !@can[:edit] %>
  • <% else %> -
  • <%= context_menu_link l(:button_edit), bulk_edit_issues_path(:ids => @issue_ids), +
  • <%= context_menu_link l(:label_bulk_edit), bulk_edit_issues_path(:ids => @issue_ids), :class => 'icon icon-edit', :disabled => !@can[:edit] %>
  • <% end %> diff --git a/app/views/context_menus/time_entries.html.erb b/app/views/context_menus/time_entries.html.erb index 0f40706f45..3bf138e912 100644 --- a/app/views/context_menus/time_entries.html.erb +++ b/app/views/context_menus/time_entries.html.erb @@ -3,7 +3,7 @@
  • <%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => @time_entry}, :class => 'icon icon-edit', :disabled => !@can[:edit] %>
  • <% else %> -
  • <%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)}, +
  • <%= context_menu_link l(:label_bulk_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)}, :class => 'icon icon-edit', :disabled => !@can[:edit] %>
  • <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 952138bf4e..b9038a6512 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -928,6 +928,7 @@ en: label_changeset_plural: Changesets label_default_columns: Default columns label_no_change_option: (No change) + label_bulk_edit: Bulk edit label_bulk_edit_selected_issues: Bulk edit selected issues label_bulk_edit_selected_time_entries: Bulk edit selected time entries label_theme: Theme diff --git a/config/locales/ja.yml b/config/locales/ja.yml index e5c153d517..1815185113 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -757,6 +757,7 @@ ja: label_changeset_plural: 更新履歴 label_default_columns: デフォルトの項目 label_no_change_option: (変更無し) + label_bulk_edit: 一括編集 label_bulk_edit_selected_issues: チケットの一括編集 label_theme: テーマ label_default: デフォルト diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index ccbc4dfba3..691c83b35c 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -70,7 +70,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest } assert_response :success - assert_select 'a.icon-edit[href=?]', '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2', :text => 'Edit' + assert_select 'a.icon-edit[href=?]', '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2', :text => 'Bulk edit' assert_select 'a.icon-copy[href=?]', '/issues/bulk_edit?copy=1&ids%5B%5D=1&ids%5B%5D=2', :text => 'Copy' assert_select 'a.icon-del[href=?]', '/issues?ids%5B%5D=1&ids%5B%5D=2', :text => 'Delete' @@ -112,7 +112,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest ids = [1, 2].map {|i| "ids%5B%5D=#{i}"}.join('&') - assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Edit' + assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Bulk edit' # issue_id: '1,2', set_filter: 1, status_id: '*' assert_select 'a.icon-copy-link[data-clipboard-text=?]', "http://test.host/projects/ecookbook/issues?issue_id=1%2C2&set_filter=1&status_id=%2A", :text => 'Copy link' assert_select 'a.icon-copy[href=?]', "/issues/bulk_edit?copy=1&#{ids}", :text => 'Copy' @@ -135,7 +135,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest ids = [1, 2, 6].map {|i| "ids%5B%5D=#{i}"}.join('&') - assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Edit' + assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Bulk edit' # issue_id: '1,2,6', set_filter: 1, status_id: '*' assert_select 'a.icon-copy-link[data-clipboard-text=?]', "http://test.host/issues?issue_id=1%2C2%2C6&set_filter=1&status_id=%2A", :text => 'Copy link' assert_select 'a.icon-del[href=?]', "/issues?#{ids}", :text => 'Delete' @@ -402,7 +402,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest ) assert_response :success - assert_select 'a:not(.disabled)', :text => 'Edit' + assert_select 'a:not(.disabled)', :text => 'Bulk edit' end def test_context_menu_for_one_time_entry @@ -454,7 +454,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest ) assert_response :success - assert_select 'a:not(.disabled)', :text => 'Edit' + assert_select 'a:not(.disabled)', :text => 'Bulk edit' end def test_time_entries_context_menu_without_edit_permission @@ -468,6 +468,6 @@ class ContextMenusControllerTest < Redmine::ControllerTest ) assert_response :success - assert_select 'a.disabled', :text => 'Edit' + assert_select 'a.disabled', :text => 'Bulk edit' end end