From 221a7ce4027f6dfeec1828315b19687f9a5d87f9 Mon Sep 17 00:00:00 2001 From: Konrad Date: Thu, 1 Apr 2021 23:29:02 +0200 Subject: [PATCH 1/2] Add independent string for 'update cart' orders_form_update_cart --- config/locales/en.yml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 2723b4b022..560b32ac36 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1889,39 +1889,40 @@ See the %{link} to find out more about %{sitename}'s features and to start using shops_signup_help_text: You need a better return. You need new buyers and logistics partners. You need your story told across wholesale, retail, and the kitchen table. shops_signup_detail: Here's the detail. - orders: Orders - orders_fees: Fees... - orders_edit_title: Shopping Cart - orders_edit_headline: Your shopping cart - orders_edit_time: Order ready for - orders_edit_continue: Continue shopping - orders_edit_checkout: Checkout + orders: "Orders" + orders_fees: "Fees..." + orders_edit_title: "Shopping Cart" + orders_edit_headline: "Your shopping cart" + orders_edit_time: "Order ready for" + orders_edit_continue: "Continue shopping" + orders_edit_checkout: "Checkout" orders_form_empty_cart: "Empty cart" - orders_form_subtotal: Produce subtotal - orders_form_admin: Admin & Handling - orders_form_total: Total - orders_oc_expired_headline: Orders have closed for this order cycle + orders_form_update_cart: "Update" + orders_form_subtotal: "Produce subtotal" + orders_form_admin: "Admin & Handling" + orders_form_total: "Total" + orders_oc_expired_headline: "Orders have closed for this order cycle" orders_oc_expired_text: "Sorry, orders for this order cycle closed %{time} ago! Please contact your hub directly to see if they can accept late orders." orders_oc_expired_text_others_html: "Sorry, orders for this order cycle closed %{time} ago! Please contact your hub directly to see if they can accept late orders %{link}." orders_oc_expired_text_link: "or see the other order cycles available at this hub" orders_oc_expired_email: "Email:" orders_oc_expired_phone: "Phone:" - orders_show_title: Order Confirmation - orders_show_time: Order ready on + orders_show_title: "Order Confirmation" + orders_show_time: "Order ready on" orders_show_order_number: "Order #%{number}" - orders_show_cancelled: Cancelled - orders_show_confirmed: Confirmed + orders_show_cancelled: "Cancelled" + orders_show_confirmed: "Confirmed" orders_your_order_has_been_cancelled: "Your order has been cancelled" orders_could_not_cancel: "Sorry, the order could not be cancelled" orders_cannot_remove_the_final_item: "Cannot remove the final item from an order, please cancel the order instead." orders_bought_items_notice: - one: An additional item is already confirmed for this order cycle + one: "An additional item is already confirmed for this order cycle" few: "%{count} additional items already confirmed for this order cycle" many: "%{count} additional items already confirmed for this order cycle" other: "%{count} additional items already confirmed for this order cycle" - orders_bought_edit_button: Edit confirmed items + orders_bought_edit_button: "Edit confirmed items" orders_bought_already_confirmed: "* already confirmed" - orders_confirm_cancel: Are you sure you want to cancel this order? + orders_confirm_cancel: "Are you sure you want to cancel this order?" order_processed_successfully: "Your order has been processed successfully" products_cart_distributor_choice: "Distributor for your order:" From 7c47102869286715667b34182c6ecf01a1ddbbda Mon Sep 17 00:00:00 2001 From: Konrad Date: Thu, 1 Apr 2021 23:30:00 +0200 Subject: [PATCH 2/2] Use new independent label for 'update cart' orders_form_update_cart --- app/views/spree/orders/form/_cart_actions_row.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/spree/orders/form/_cart_actions_row.html.haml b/app/views/spree/orders/form/_cart_actions_row.html.haml index a7005a5eb6..e37adb037b 100644 --- a/app/views/spree/orders/form/_cart_actions_row.html.haml +++ b/app/views/spree/orders/form/_cart_actions_row.html.haml @@ -3,7 +3,7 @@ %td %button#update-button.secondary.radius.expand.small{"ng-class" => "{ alert: form.$dirty && form.$valid }"} %i.ofn-i_023-refresh - = t(:update) + = t(:orders_form_update_cart) %td %td#empty-cart.text-center %span#clear_cart_link{"data-hook" => ""}