meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

Rename the save, edit and delete buttons on the query form to clarify the scope (#34494).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21191 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-08-17 12:41:58 +00:00
parent 001252d966
commit 33b5cf1c73
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -1505,14 +1505,14 @@ module ApplicationHelper
html.html_safe
end
def delete_link(url, options={})
def delete_link(url, options={}, button_name=l(:button_delete))
options = {
:method => :delete,
:data => {:confirm => l(:text_are_you_sure)},
:class => 'icon icon-del'
}.merge(options)
link_to l(:button_delete), url, options
link_to button_name, url, options
end
def link_to_function(name, function, html_options={})

6
app/views/calendars/show.html.erb
View File

@ -28,13 +28,13 @@
<%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
<%= link_to_function l(:button_save),
<%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
:class => 'icon icon-save' %>
<% end %>
<% if !@query.new_record? && @query.editable_by?(User.current) %>
<%= link_to l(:button_edit), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :calendar => 1) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
<% end %>
</p>
</div>

6
app/views/gantts/show.html.erb
View File

@ -91,13 +91,13 @@
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
:class => 'icon icon-reload' %>
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
<%= link_to_function l(:button_save),
<%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
:class => 'icon icon-save' %>
<% end %>
<% if !@query.new_record? && @query.editable_by?(User.current) %>
<%= link_to l(:button_edit), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :gantt => 1) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
<% end %>
</p>
</div>

6
app/views/queries/_query_form.html.erb
View File

@ -57,14 +57,14 @@
<%= link_to l(:button_clear), { :set_filter => 1, :sort => '', :project_id => @project }, :class => 'icon icon-reload' %>
<% if @query.new_record? %>
<% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
<%= link_to_function l(:button_save),
<%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
"$('#query_type').prop('disabled',false);$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
:class => 'icon icon-save' %>
<% end %>
<% else %>
<% if @query.editable_by?(User.current) %>
<%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
<% end %>
<% end %>
</p>

3
config/locales/en.yml
View File

@ -1182,6 +1182,9 @@ en:
button_filter: Filter
button_actions: Actions
button_add_subtask: Add subtask
button_save_object: "Save %{object_name}"
button_edit_object: "Edit %{object_name}"
button_delete_object: "Delete %{object_name}"
status_active: active
status_registered: registered

3
config/locales/ja.yml
View File

@ -867,6 +867,9 @@ ja:
button_configure: 設定
button_quote: 引用
button_show: 表示
button_save_object: "%{object_name}を保存"
button_edit_object: "%{object_name}を編集"
button_delete_object: "%{object_name}を削除"
status_active: 有効
status_registered: 登録