From ba447b547d296bf76b62307fcf801bac3f75efe2 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Thu, 13 Jul 2017 21:13:20 +0100 Subject: [PATCH] Order tooltip localisation --- .../admin/orders/index/add_ship_shortcut.html.haml.deface | 2 +- app/views/spree/admin/orders/_capture.html.haml | 2 +- config/locales/en-GB.yml | 3 +++ config/locales/en.yml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/overrides/spree/admin/orders/index/add_ship_shortcut.html.haml.deface b/app/overrides/spree/admin/orders/index/add_ship_shortcut.html.haml.deface index cf0b2b0abb..a0ac8a7266 100644 --- a/app/overrides/spree/admin/orders/index/add_ship_shortcut.html.haml.deface +++ b/app/overrides/spree/admin/orders/index/add_ship_shortcut.html.haml.deface @@ -3,4 +3,4 @@ - if order.ready_to_ship? - # copied from backend/app/views/spree/admin/payments/_list.html.erb - = link_to_with_icon "icon-road", t(:ship), fire_admin_order_url(order, :e => 'ship'), :method => :put, :no_text => true, :data => {:action => 'ship', :confirm => t(:are_you_sure)} + = link_to_with_icon "icon-road", t('admin.orders.index.ship'), fire_admin_order_url(order, :e => 'ship'), :method => :put, :no_text => true, :data => {:action => 'ship', :confirm => t(:are_you_sure)} diff --git a/app/views/spree/admin/orders/_capture.html.haml b/app/views/spree/admin/orders/_capture.html.haml index 327c5cf320..b1267badbb 100644 --- a/app/views/spree/admin/orders/_capture.html.haml +++ b/app/views/spree/admin/orders/_capture.html.haml @@ -4,4 +4,4 @@ - if !payment.nil? - payment.actions.grep(/^capture$/).each do |action| - # copied from backend/app/views/spree/admin/payments/_list.html.erb - = link_to_with_icon "icon-#{action}", t(action), fire_admin_order_payment_path(order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} + = link_to_with_icon "icon-#{action}", t('admin.orders.index.capture'), fire_admin_order_payment_path(order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 93f71ce400..acd6a88835 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -178,6 +178,9 @@ en-GB: hidden_powertip: These products have been hidden from your inventory and will not be available to add to your shop. You can click 'Add' to add a product to you inventory. new_powertip: These products are available to be added to your inventory. Click 'Add' to add a product to your inventory, or 'Hide' to hide it from view. You can always change your mind later! orders: + index: + capture: "Mark as paid" + ship: "Mark as delivered" bulk_management: tip: "Use this page to alter product quantities across multiple orders. Products may also be removed from orders entirely, if required." shared: "Shared Resource?" diff --git a/config/locales/en.yml b/config/locales/en.yml index 20a4d2cb35..3346930377 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -364,6 +364,9 @@ en: controls: back_to_my_inventory: Back to my inventory orders: + index: + capture: "Capture" + ship: "Ship" bulk_management: tip: "Use this page to alter product quantities across multiple orders. Products may also be removed from orders entirely, if required." shared: "Shared Resource?"