From c4ee6b14ffb773c6e6c0f004cf5edd9234e2761e Mon Sep 17 00:00:00 2001 From: EdwardLi-coder <2023edwardll@gmail.com> Date: Fri, 16 Aug 2024 09:08:03 +0800 Subject: [PATCH 1/2] clear error message and clean up --- config/locales/en.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index c4de413118..9826e46a4b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3045,7 +3045,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using spree_admin_single_enterprise_hint: "Hint: To allow people to find you, turn on your visibility under" spree_admin_eg_pickup_from_school: "eg. 'Pick-up from Primary School'" spree_admin_eg_collect_your_order: "eg. 'Please collect your order from 123 Imaginary St, Northcote, 3070'" - spree_classification_primary_taxon_error: "Taxon %{taxon} is the primary taxon of %{product} and cannot be deleted" spree_order_availability_error: "Distributor or order cycle cannot supply the products in your cart" spree_order_populator_error: "That distributor or order cycle can't supply all the products in your cart. Please choose another." spree_order_cycle_error: "Please choose an order cycle for this order." @@ -4594,7 +4593,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using destroy: delete_taxon: success: "Successfully deleted the product category" - error: "Unable to delete the product category" + error: "Unable to delete the product category due to assigned products." form: name: Name meta_title: Meta Title @@ -4838,7 +4837,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using key_cleared: "Key cleared" shipment: cannot_ready: "Cannot ready shipment." - invalid_taxonomy_id: "Invalid taxonomy id." toggle_api_key_view: "Show API key view for user" activerecord: models: From 05315ff8e055e3f1a11e4970075b95278af8fa62 Mon Sep 17 00:00:00 2001 From: EdwardLi-coder <2023edwardll@gmail.com> Date: Fri, 16 Aug 2024 20:53:13 +0800 Subject: [PATCH 2/2] delete spree.new_taxon --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9826e46a4b..2b94bdfa00 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3947,7 +3947,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using more: "More" new_adjustment: "New adjustment" new_tax_category: "New Tax Category" - new_taxon: "New taxon" new_user: "New user" no_pending_payments: "No pending payments" remove: "Remove"