Merge pull request #769 from Murph33/remove_into_actions_translations…

…_scope Put remove into 'actions' translations scope
solidusio · Feb 1, 2016 · c8c0335 · c8c0335
2 parents 227e35a + 90b5e82
commit c8c0335
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rb
@@ -147,7 +147,7 @@ def link_to_remove_fields(name, f, options = {})
  options[:class] = '' unless options[:class]
  options[:class] += 'no-text with-tip' if options[:no_text]
  url = f.object.persisted? ? [:admin, f.object] : '#'
- link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: Spree.t(:remove)) + f.hidden_field(:_destroy)
+ link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: Spree.t('actions.remove')) + f.hidden_field(:_destroy)
  end
 
  def spree_dom_id(record)

diff --git a/backend/app/views/spree/admin/option_types/_option_value_fields.html.erb b/backend/app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -7,5 +7,5 @@
  <% end %>
  <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
  <td class="presentation"><%= f.text_field :presentation %></td>
- <td class="actions"><%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %></td>
+ <td class="actions"><%= link_to_remove_fields Spree.t('actions.remove'), f, :no_text => true %></td>
 </tr>
diff --git a/backend/app/views/spree/admin/taxons/_taxon_table.html.erb b/backend/app/views/spree/admin/taxons/_taxon_table.html.erb
@@ -12,7 +12,7 @@
  <td><%= taxon.name %></td>
  <td><%= taxon_path taxon %></td>
  <td class="actions">
- <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon('delete') + ' ' + Spree.t(:remove) %>
+ <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon('delete') + ' ' + Spree.t('actions.remove') %>
  </td>
  </tr>
  <% end %>

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
@@ -414,6 +414,7 @@ en:
  new: New
  refund: Refund
  receive: Receive
+ remove: Remove
  save: Save
  update: Update
  activate: Activate