From 792630b28f8ef4618313f09ed5dee93a60e3adda Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 16:22:12 +0200 Subject: [PATCH 01/10] Add missing translations for shipping method <%= Spree::ShippingMethod.human_attribute_name(:available_to_users) %> --- core/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index ec5e7423a8f..b1c5f4734eb 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -294,6 +294,7 @@ en: name: Name spree/shipping_method: admin_name: Internal Name + available_to_users: Available to users carrier: Carrier code: Code display_on: Display From c42f8ab412aff055298fbcee4e8cc1ba1e498305 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 16:36:31 +0200 Subject: [PATCH 02/10] Differentiate stock location geographic state from status `state_id` is alreasy use to define the stock location state (like Alabama). So I added a `state` translation that means "status". This pattern is already used in `spree/admin/refund_reasons/index.html.erb`: `<%= Spree::RefundReason.human_attribute_name(:state) %>` --- backend/app/views/spree/admin/stock_locations/index.html.erb | 2 +- core/config/locales/en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/app/views/spree/admin/stock_locations/index.html.erb b/backend/app/views/spree/admin/stock_locations/index.html.erb index c215ea09240..849d0b10d8c 100644 --- a/backend/app/views/spree/admin/stock_locations/index.html.erb +++ b/backend/app/views/spree/admin/stock_locations/index.html.erb @@ -28,7 +28,7 @@ <%= Spree::StockLocation.human_attribute_name(:name) %> - <%= Spree::StockLocation.human_attribute_name(:state_id) %> + <%= Spree::StockLocation.human_attribute_name(:state) %> <%= plural_resource_name(Spree::StockMovement) %> diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index b1c5f4734eb..ba68e224dab 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -327,6 +327,7 @@ en: phone: Phone propagate_all_variants: Propagate All Variants restock_inventory: Restock Inventory + state: State state_id: State zipcode: Zip spree/stock_movement: From 133c50caa93c40d733133f3eca9c1713f11bfdc4 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 16:40:59 +0200 Subject: [PATCH 03/10] Add missing translations for refund reason `<%= Spree::RefundReason.human_attribute_name(:state) %>` --- core/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index ba68e224dab..30a65a85368 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -250,6 +250,7 @@ en: active: Active code: Code name: Name + state: State spree/reimbursement: created_at: Date/Time number: Number From 7c2004aa6ed3aed891ad0aec5375e710d7fe095c Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 16:46:38 +0200 Subject: [PATCH 04/10] Add missing store credit reason attributes translations for backend --- core/config/locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 30a65a85368..f032890e2c9 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -361,6 +361,9 @@ en: action: Action amount_remaining: Total Unused user_total_amount: Total Amount + spree/store_credit_reason: + name: Name + state: State spree/store_credit_update_reason: name: Name spree/tax_category: From 45fcce61c543926bc766a9b6f395c5b4c759d0e5 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 16:49:26 +0200 Subject: [PATCH 05/10] Fix new store credit reason link name Translation is already present --- .../app/views/spree/admin/store_credit_reasons/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/views/spree/admin/store_credit_reasons/index.html.erb b/backend/app/views/spree/admin/store_credit_reasons/index.html.erb index 8e86844c7ec..a1fdb605b1a 100644 --- a/backend/app/views/spree/admin/store_credit_reasons/index.html.erb +++ b/backend/app/views/spree/admin/store_credit_reasons/index.html.erb @@ -7,7 +7,7 @@ <% content_for :page_actions do %>
  • - <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %> + <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
<% end %> From 1c94e55bd41febfe0495a74f6e79c77e497b8d44 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 16:52:21 +0200 Subject: [PATCH 06/10] Add missing tax category translation in backend `<%= Spree::TaxRate.human_attribute_name(:tax_categories) %>` --- core/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index f032890e2c9..132b8e246c3 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -378,6 +378,7 @@ en: name: Name show_rate_in_label: Show Rate in Label starts_at: Start Date + tax_categories: Tax Categories spree/taxon: description: Description icon: Icon From 5a940522ebf08471e035d8b9ad8dbd08a3635a07 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 17:04:32 +0200 Subject: [PATCH 07/10] Add missing code translations for promotion category --- core/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 132b8e246c3..a7d9779923b 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -238,6 +238,7 @@ en: spree/promotion/rules/user_role: description: Order includes User with specified Role(s) spree/promotion_category: + code: Code name: Name spree/property: name: Name From 22ab7d2e2a633d88dc658752bd4a77a8537c5769 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 17:07:46 +0200 Subject: [PATCH 08/10] Add missing translations for promotions index page in backend `<%= Spree::Promotion.human_attribute_name(:uses) %>` --- core/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index a7d9779923b..e710a6a2c59 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -200,6 +200,7 @@ en: starts_at: Start status: Status usage_limit: Usage Limit + uses: Uses spree/promotion/actions/create_adjustment: description: Creates a promotion credit adjustment on the order spree/promotion/actions/create_item_adjustments: From 75675b3bf06d36d29edcb0024b995603edc4ea9b Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 17:24:30 +0200 Subject: [PATCH 09/10] Add missing translations for promotional code (and batches) --- core/config/locales/en.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index e710a6a2c59..7f51de3a2f6 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -241,6 +241,15 @@ en: spree/promotion_category: code: Code name: Name + spree/promotion_code: + value: Value + spree/promotion_code_batch: + base_code: Base code + email: Email + join_characters: Join characters + number_of_codes: Number of codes + status: Status + total_codes: Total codes spree/property: name: Name presentation: Presentation From 833adc24c387eda195cb93a5c59ae80c7c993168 Mon Sep 17 00:00:00 2001 From: Fabrizio Monti Date: Mon, 26 Aug 2019 17:32:16 +0200 Subject: [PATCH 10/10] Add missing translations for spree price --- core/config/locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 7f51de3a2f6..e04bfcbc578 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -163,8 +163,11 @@ en: type: Type spree/price: amount: Price + country: Country currency: Currency is_default: Currently Valid + price: Price + variant: Variant spree/product: available_on: Available On cost_currency: Cost Currency