From 5420910907dd4477d2cf4726fdaf89f62a7a546b Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Dec 2023 12:05:09 +0000 Subject: [PATCH 01/21] Adds output from i18n-tasks on missing keys --- missing_keys.txt | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 missing_keys.txt diff --git a/missing_keys.txt b/missing_keys.txt new file mode 100644 index 0000000000..6e7c5445e8 --- /dev/null +++ b/missing_keys.txt @@ -0,0 +1,55 @@ ++--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ +| Locale | Key | Value in other locales or source | ++--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ +| all | admin.: | app/views/spree/admin/variants/_form.html.haml:11 | +| all | admin.customers.index.: | app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee:54 | +| all | admin.stripe_connect_settings.edit.instance_publishable_key | app/views/admin/stripe_connect_settings/edit.html.haml:44 | +| all | card_code | app/views/spree/admin/payments/source_forms/_gateway.html.haml:39 | +| all | card_type_is | app/views/spree/admin/payments/source_forms/_gateway.html.haml:23 | +| all | checkout.step1.your_details.first_name.label | app/views/checkout/payment/_gateway.html.haml:3 | +| all | checkout.step1.your_details.first_name.placeholder | app/views/checkout/payment/_gateway.html.haml:4 | +| all | checkout.step1.your_details.last_name.label | app/views/checkout/payment/_gateway.html.haml:8 | +| all | checkout.step1.your_details.last_name.placeholder | app/views/checkout/payment/_gateway.html.haml:9 | +| all | connect_body | app/views/home/_connect.html.haml:5 | +| all | connect_cta | app/views/home/_connect.html.haml:7 | +| all | continue_shopping | app/views/spree/orders/edit.html.haml:32 | +| all | devise.shared.links.didn_t_receive_confirmation_instructions | app/views/devise/shared/_links.html.erb:14 | +| all | devise.shared.links.didn_t_receive_unlock_instructions | app/views/devise/shared/_links.html.erb:18 | +| all | devise.shared.links.forgot_your_password | app/views/devise/shared/_links.html.erb:10 | +| all | devise.shared.links.sign_in | app/views/devise/shared/_links.html.erb:2 | +| all | devise.shared.links.sign_up | app/views/devise/shared/_links.html.erb:6 | +| all | expiration | app/views/spree/admin/payments/source_forms/_gateway.html.haml:34 | +| all | footer_links_helper.cookies_policy_link.footer_data_cookies_policy | app/helpers/footer_links_helper.rb:7 | +| all | footer_links_helper.privacy_policy_link.footer_data_privacy_policy | app/helpers/footer_links_helper.rb:15 | +| all | inflections | app/assets/javascripts/admin/products/services/option_value_namer.js.coffee:42 | +| all | js.admin.enterprises.form.images.: | app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee:76 | +| all | js.admin.orders.order_state.: | app/views/spree/admin/orders/_table_row.html.haml:23 | +| all | js.admin.orders.payment_states.: | app/views/spree/admin/orders/_table_row.html.haml:28 | +| all | js.admin.orders.shipment_states.: | app/views/spree/admin/orders/_table_row.html.haml:35 | +| all | js.subscriptions.: | app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee:10 | +| all | label_connect | app/views/home/_connect.html.haml:4 | +| all | label_learn | app/views/home/_learn.html.haml:4 | +| all | learn_body | app/views/home/_learn.html.haml:5 | +| all | learn_cta | app/views/home/_learn.html.haml:7 | +| all | meta_description | app/views/spree/admin/taxons/_form.html.haml:20 | +| all | meta_keywords | app/views/spree/admin/taxons/_form.html.haml:24 | +| all | meta_title | app/views/spree/admin/taxons/_form.html.haml:16 | +| all | order_has_no_payments | app/views/spree/admin/payments/index.html.haml:24 | +| all | order_not_found | app/controllers/spree/orders_controller.rb:63 | +| all | paypal.spree.admin.payments.source_forms.paypal.no_payment_via_admin_backend | app/views/spree/admin/payments/source_forms/_paypal.html.haml:2 | +| all | spree.admin.payment_methods.form.: | app/views/spree/admin/payment_methods/_form.html.haml:26 | +| all | spree.admin.payment_methods.index.: | app/views/spree/admin/payment_methods/index.html.haml:43 | +| all | spree.admin.return_authorizations.states.: | app/views/spree/admin/return_authorizations/edit.html.haml:18 | +| all | spree.back_to_states_list | app/views/spree/admin/states/edit.html.haml:10 | +| all | spree.country_name | app/views/spree/admin/countries/index.html.haml:14 | +| all | spree.editing_state | app/views/spree/admin/states/edit.html.haml:4 | +| all | spree.path | app/views/spree/admin/taxons/_taxon_table.html.haml:5 | +| all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | +| all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | +| all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | +| all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | +| all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | +| all | use_new_cc | app/views/spree/admin/payments/source_forms/_gateway.html.haml:10 | +| all | what_is_this | app/views/spree/admin/payments/source_forms/_gateway.html.haml:42 | +| all | your_cart_is_empty | app/views/spree/orders/edit.html.haml:31 | ++--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ From 3e27a34971100831ebda8e803e48ad800c306391 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Dec 2023 12:10:16 +0000 Subject: [PATCH 02/21] Adds missing key instance_publishable_key --- config/locales/en.yml | 1 + missing_keys.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 162f65d273..bfbb44fcf4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -712,6 +712,7 @@ en: status: Status ok: Ok instance_secret_key: Instance Secret Key + instance_publishable_key: Instance Publishable Key account_id: Account ID business_name: Business Name charges_enabled: Charges Enabled diff --git a/missing_keys.txt b/missing_keys.txt index 6e7c5445e8..8870adb9f0 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -1,9 +1,9 @@ +--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ | Locale | Key | Value in other locales or source | +--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ -| all | admin.: | app/views/spree/admin/variants/_form.html.haml:11 | -| all | admin.customers.index.: | app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee:54 | -| all | admin.stripe_connect_settings.edit.instance_publishable_key | app/views/admin/stripe_connect_settings/edit.html.haml:44 | +| all | admin.: | app/views/spree/admin/variants/_form.html.haml:11 | = label_tag :unit_value_human, "#{t('admin.'+@product.variant_unit)} ({{unitName(#{@product.variant_unit_scale}, '#{@product.variant_unit}')}})", seems to be a false positive... +| all | admin.customers.index.: | app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee:54 | t('admin.customers.index.' + customer.balance_status), seems to be a false positive... +| all | admin.stripe_connect_settings.edit.instance_publishable_key | app/views/admin/stripe_connect_settings/edit.html.haml:44 | seems missing, added! | all | card_code | app/views/spree/admin/payments/source_forms/_gateway.html.haml:39 | | all | card_type_is | app/views/spree/admin/payments/source_forms/_gateway.html.haml:23 | | all | checkout.step1.your_details.first_name.label | app/views/checkout/payment/_gateway.html.haml:3 | From 8db716f047e68a0115bb07cdec21a242a62bf381 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 18 Mar 2024 15:20:56 +0000 Subject: [PATCH 03/21] Adds missing key card_type_is --- config/locales/en.yml | 1 + missing_keys.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index bfbb44fcf4..27ec1ca85a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -264,6 +264,7 @@ en: not_available_to_shop: "is not available to %{shop}" card_details: "Card details" card_type: "Card type" + card_type_is: "Card type is" cardholder_name: "Cardholder name" community_forum_url: "Community forum URL" customer_instructions: "Customer instructions" diff --git a/missing_keys.txt b/missing_keys.txt index 8870adb9f0..3169e27f9c 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -4,8 +4,8 @@ | all | admin.: | app/views/spree/admin/variants/_form.html.haml:11 | = label_tag :unit_value_human, "#{t('admin.'+@product.variant_unit)} ({{unitName(#{@product.variant_unit_scale}, '#{@product.variant_unit}')}})", seems to be a false positive... | all | admin.customers.index.: | app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee:54 | t('admin.customers.index.' + customer.balance_status), seems to be a false positive... | all | admin.stripe_connect_settings.edit.instance_publishable_key | app/views/admin/stripe_connect_settings/edit.html.haml:44 | seems missing, added! -| all | card_code | app/views/spree/admin/payments/source_forms/_gateway.html.haml:39 | -| all | card_type_is | app/views/spree/admin/payments/source_forms/_gateway.html.haml:23 | +| all | card_code | app/views/spree/admin/payments/source_forms/_gateway.html.haml:39 | dynamic key, looks like a false positive. +| all | card_type_is | app/views/spree/admin/payments/source_forms/_gateway.html.haml:23 | key missing from en.yml, added. | all | checkout.step1.your_details.first_name.label | app/views/checkout/payment/_gateway.html.haml:3 | | all | checkout.step1.your_details.first_name.placeholder | app/views/checkout/payment/_gateway.html.haml:4 | | all | checkout.step1.your_details.last_name.label | app/views/checkout/payment/_gateway.html.haml:8 | From 9926b65bd9d3f39381f4ba2bb919e70c9c995afe Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 18 Mar 2024 15:34:14 +0000 Subject: [PATCH 04/21] Removes unused haml file --- app/views/checkout/payment/_gateway.html.haml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/views/checkout/payment/_gateway.html.haml diff --git a/app/views/checkout/payment/_gateway.html.haml b/app/views/checkout/payment/_gateway.html.haml deleted file mode 100644 index e2e1f8412d..0000000000 --- a/app/views/checkout/payment/_gateway.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -= f.fields :bill_address, model: @order.bill_address do |bill_address| - %div.checkout-input - = bill_address.label :firstname, t("checkout.step1.your_details.first_name.label") - = bill_address.text_field :firstname, { placeholder: t("checkout.step1.your_details.first_name.placeholder") } - = f.error_message_on "bill_address.firstname" - - %div.checkout-input - = bill_address.label :lastname, t("checkout.step1.your_details.last_name.label") - = bill_address.text_field :lastname, { placeholder: t("checkout.step1.your_details.last_name.placeholder") } - = f.error_message_on "bill_address.lastname" - -.flex{style: "justify-content: space-between; gap: 10px;" } - %div.checkout-input{style: "flex-grow: 2;" } - = f.label :card_number, t("checkout.step2.form.card_number.label") - = f.text_field :card_number, { placeholder: t("checkout.step2.form.card_number.placeholder") } - - %div.checkout-input{style: "flex: 0 1 100px;"} - = f.label :card_verification_value, t("checkout.step2.form.card_verification_value.label") - = f.number_field :card_verification_value, { placeholder: t("checkout.step2.form.card_verification_value.placeholder") } - - %div.checkout-input{style: "flex: 0 1 70px;"} - = f.label :card_month, t("checkout.step2.form.card_month.label") - = f.number_field :card_month, { placeholder: t("checkout.step2.form.card_month.placeholder"), max: 12 } - - %div.checkout-input{style: "flex: 0 1 70px;"} - = f.label :card_year, t("checkout.step2.form.card_year.label") - = f.number_field :card_year, { placeholder: t("checkout.step2.form.card_year.placeholder"), min: Time.now.year, max: Time.now.year + 10 } From e1823650063b6077a0cb56736220b74e86f5d83f Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 18 Mar 2024 17:04:29 +0000 Subject: [PATCH 05/21] Replaces missing keys by existing ones --- app/views/spree/orders/edit.html.haml | 4 ++-- missing_keys.txt | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index ddde898e32..fb50b995eb 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -28,8 +28,8 @@ #cart-container - if @order.line_items.empty? %div.row - %p= t(:your_cart_is_empty) - %p= link_to t(:continue_shopping), current_shop_products_path, :class => 'button continue' + %p= t(:cart_empty) + %p= link_to t(:orders_edit_continue), current_shop_products_path, :class => 'button continue' - else %div diff --git a/missing_keys.txt b/missing_keys.txt index 3169e27f9c..b418572e8c 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -6,13 +6,13 @@ | all | admin.stripe_connect_settings.edit.instance_publishable_key | app/views/admin/stripe_connect_settings/edit.html.haml:44 | seems missing, added! | all | card_code | app/views/spree/admin/payments/source_forms/_gateway.html.haml:39 | dynamic key, looks like a false positive. | all | card_type_is | app/views/spree/admin/payments/source_forms/_gateway.html.haml:23 | key missing from en.yml, added. -| all | checkout.step1.your_details.first_name.label | app/views/checkout/payment/_gateway.html.haml:3 | -| all | checkout.step1.your_details.first_name.placeholder | app/views/checkout/payment/_gateway.html.haml:4 | -| all | checkout.step1.your_details.last_name.label | app/views/checkout/payment/_gateway.html.haml:8 | -| all | checkout.step1.your_details.last_name.placeholder | app/views/checkout/payment/_gateway.html.haml:9 | -| all | connect_body | app/views/home/_connect.html.haml:5 | -| all | connect_cta | app/views/home/_connect.html.haml:7 | -| all | continue_shopping | app/views/spree/orders/edit.html.haml:32 | +| all | checkout.step1.your_details.first_name.label | app/views/checkout/payment/_gateway.html.haml:3 | - seems to be an unused key/file, file removed. +| all | checkout.step1.your_details.first_name.placeholder | app/views/checkout/payment/_gateway.html.haml:4 | - seems to be an unused key/file, file removed. +| all | checkout.step1.your_details.last_name.label | app/views/checkout/payment/_gateway.html.haml:8 | - seems to be an unused key/file, file removed. +| all | checkout.step1.your_details.last_name.placeholder | app/views/checkout/payment/_gateway.html.haml:9 | - seems to be an unused key/file, file removed. +| all | connect_body | app/views/home/_connect.html.haml:5 | - seem to be missing - NEEDS ISSUE +| all | connect_cta | app/views/home/_connect.html.haml:7 | - seem to be missing - NEEDS ISSUE +| all | continue_shopping | app/views/spree/orders/edit.html.haml:32 | -replaced missing keys by existing ones | all | devise.shared.links.didn_t_receive_confirmation_instructions | app/views/devise/shared/_links.html.erb:14 | | all | devise.shared.links.didn_t_receive_unlock_instructions | app/views/devise/shared/_links.html.erb:18 | | all | devise.shared.links.forgot_your_password | app/views/devise/shared/_links.html.erb:10 | From acc036b1d7b7eccf87cc5197d42bd1ededaba738 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 12:30:20 +0000 Subject: [PATCH 06/21] Removes missing payement message I've checked staging, and I could not find this message, nor the entry in the en.yml file - I think we're not rendering this message currently, hence, the removal. --- app/views/spree/admin/payments/index.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/spree/admin/payments/index.html.haml b/app/views/spree/admin/payments/index.html.haml index 98e00c102d..c3c52c2a23 100644 --- a/app/views/spree/admin/payments/index.html.haml +++ b/app/views/spree/admin/payments/index.html.haml @@ -20,5 +20,3 @@ - if @payments.any? = render partial: 'list', locals: { payments: @payments } -- else - .alpha.twelve.columns.no-objects-found= t(:order_has_no_payments) From b1e10f3dd466c2860b5012ba8de852284387a8c7 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 12:59:00 +0000 Subject: [PATCH 07/21] Replaces missing by existing key I'm not sure how to trigger this error, and triggering an update error message seems appropriate too - it's sort of an edge case, perhaps this is a valid approach --- app/controllers/spree/orders_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb index 7ac23f8222..af0738b17e 100644 --- a/app/controllers/spree/orders_controller.rb +++ b/app/controllers/spree/orders_controller.rb @@ -60,7 +60,7 @@ module Spree @insufficient_stock_lines = [] @order = order_to_update unless @order - flash[:error] = t(:order_not_found) + flash[:error] = t(:order_not_updated) redirect_to(main_app.root_path) && return end From eb82e30cf684f1f30425995cee64f2e56481415a Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 16:17:33 +0000 Subject: [PATCH 08/21] Adds keys spree.editing_state and spree.back_to_states_list --- config/locales/en.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 27ec1ca85a..f6910f595b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3874,6 +3874,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using editing_tax_category: "Editing tax category" editing_tax_rate: "Editing tax rate" editing_zone: "Editing zone" + editing_state: "Editing State" expiration: "Expiration" invalid_payment_provider: "Invalid payment provider" items_cannot_be_shipped: "Items cannot be shipped" @@ -3911,6 +3912,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using resend: "Resend" back_to_orders_list: "Back To Orders List" back_to_payments_list: "Back To Payments List" + back_to_states_list: "Back To States List" return_authorizations: "Return Authorizations" cannot_create_returns: "Cannot create returns as this order has no shipped units." select_stock: "Select stock" From 8ca019d00c89e794a13475cabd8bd74dc220b490 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 16:20:36 +0000 Subject: [PATCH 09/21] updates missing translations txt file --- missing_keys.txt | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/missing_keys.txt b/missing_keys.txt index b418572e8c..7905f278ed 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -12,38 +12,38 @@ | all | checkout.step1.your_details.last_name.placeholder | app/views/checkout/payment/_gateway.html.haml:9 | - seems to be an unused key/file, file removed. | all | connect_body | app/views/home/_connect.html.haml:5 | - seem to be missing - NEEDS ISSUE | all | connect_cta | app/views/home/_connect.html.haml:7 | - seem to be missing - NEEDS ISSUE -| all | continue_shopping | app/views/spree/orders/edit.html.haml:32 | -replaced missing keys by existing ones -| all | devise.shared.links.didn_t_receive_confirmation_instructions | app/views/devise/shared/_links.html.erb:14 | -| all | devise.shared.links.didn_t_receive_unlock_instructions | app/views/devise/shared/_links.html.erb:18 | -| all | devise.shared.links.forgot_your_password | app/views/devise/shared/_links.html.erb:10 | -| all | devise.shared.links.sign_in | app/views/devise/shared/_links.html.erb:2 | -| all | devise.shared.links.sign_up | app/views/devise/shared/_links.html.erb:6 | -| all | expiration | app/views/spree/admin/payments/source_forms/_gateway.html.haml:34 | -| all | footer_links_helper.cookies_policy_link.footer_data_cookies_policy | app/helpers/footer_links_helper.rb:7 | -| all | footer_links_helper.privacy_policy_link.footer_data_privacy_policy | app/helpers/footer_links_helper.rb:15 | -| all | inflections | app/assets/javascripts/admin/products/services/option_value_namer.js.coffee:42 | -| all | js.admin.enterprises.form.images.: | app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee:76 | -| all | js.admin.orders.order_state.: | app/views/spree/admin/orders/_table_row.html.haml:23 | -| all | js.admin.orders.payment_states.: | app/views/spree/admin/orders/_table_row.html.haml:28 | -| all | js.admin.orders.shipment_states.: | app/views/spree/admin/orders/_table_row.html.haml:35 | -| all | js.subscriptions.: | app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee:10 | -| all | label_connect | app/views/home/_connect.html.haml:4 | -| all | label_learn | app/views/home/_learn.html.haml:4 | -| all | learn_body | app/views/home/_learn.html.haml:5 | -| all | learn_cta | app/views/home/_learn.html.haml:7 | -| all | meta_description | app/views/spree/admin/taxons/_form.html.haml:20 | -| all | meta_keywords | app/views/spree/admin/taxons/_form.html.haml:24 | -| all | meta_title | app/views/spree/admin/taxons/_form.html.haml:16 | -| all | order_has_no_payments | app/views/spree/admin/payments/index.html.haml:24 | -| all | order_not_found | app/controllers/spree/orders_controller.rb:63 | -| all | paypal.spree.admin.payments.source_forms.paypal.no_payment_via_admin_backend | app/views/spree/admin/payments/source_forms/_paypal.html.haml:2 | -| all | spree.admin.payment_methods.form.: | app/views/spree/admin/payment_methods/_form.html.haml:26 | -| all | spree.admin.payment_methods.index.: | app/views/spree/admin/payment_methods/index.html.haml:43 | -| all | spree.admin.return_authorizations.states.: | app/views/spree/admin/return_authorizations/edit.html.haml:18 | -| all | spree.back_to_states_list | app/views/spree/admin/states/edit.html.haml:10 | -| all | spree.country_name | app/views/spree/admin/countries/index.html.haml:14 | +| all | continue_shopping | app/views/spree/orders/edit.html.haml:32 | - replaced missing keys by existing ones +| all | devise.shared.links.didn_t_receive_confirmation_instructions | app/views/devise/shared/_links.html.erb:14 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 +| all | devise.shared.links.didn_t_receive_unlock_instructions | app/views/devise/shared/_links.html.erb:18 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 +| all | devise.shared.links.forgot_your_password | app/views/devise/shared/_links.html.erb:10 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 +| all | devise.shared.links.sign_in | app/views/devise/shared/_links.html.erb:2 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 +| all | devise.shared.links.sign_up | app/views/devise/shared/_links.html.erb:6 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 +| all | expiration | app/views/spree/admin/payments/source_forms/_gateway.html.haml:34 | - dynamic key, false positive +| all | footer_links_helper.cookies_policy_link.footer_data_cookies_policy | app/helpers/footer_links_helper.rb:7 | - dynamic key, false positive +| all | footer_links_helper.privacy_policy_link.footer_data_privacy_policy | app/helpers/footer_links_helper.rb:15 | - dynamic key, false positive +| all | inflections | app/assets/javascripts/admin/products/services/option_value_namer.js.coffee:42 | - dynamic key, false positive +| all | js.admin.enterprises.form.images.: | app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee:76 | - dynamic key, false positive +| all | js.admin.orders.order_state.: | app/views/spree/admin/orders/_table_row.html.haml:23 | - dynamic key, false positive +| all | js.admin.orders.payment_states.: | app/views/spree/admin/orders/_table_row.html.haml:28 | - dynamic key, false positive +| all | js.admin.orders.shipment_states.: | app/views/spree/admin/orders/_table_row.html.haml:35 | - dynamic key, false positive +| all | js.subscriptions.: | app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee:10 | - dynamic key, false positive +| all | label_connect | app/views/home/_connect.html.haml:4 | - seem to be missing - NEEDS ISSUE +| all | label_learn | app/views/home/_learn.html.haml:4 | - seem to be missing - NEEDS ISSUE +| all | learn_body | app/views/home/_learn.html.haml:5 | - seem to be missing - NEEDS ISSUE +| all | learn_cta | app/views/home/_learn.html.haml:7 | - seem to be missing - NEEDS ISSUE +| all | meta_description | app/views/spree/admin/taxons/_form.html.haml:20 | - exists in en.yml, seems to be a false positive +| all | meta_keywords | app/views/spree/admin/taxons/_form.html.haml:24 | - exists in en.yml, seems to be a false positive +| all | meta_title | app/views/spree/admin/taxons/_form.html.haml:16 | - exists in en.yml, seems to be a false positive +| all | order_has_no_payments | app/views/spree/admin/payments/index.html.haml:24 | - removed key +| all | order_not_found | app/controllers/spree/orders_controller.rb:63 | - replaced key +| all | paypal.spree.admin.payments.source_forms.paypal.no_payment_via_admin_backend | app/views/spree/admin/payments/source_forms/_paypal.html.haml:2 | - key exists, looks like a false positive +| all | spree.admin.payment_methods.form.: | app/views/spree/admin/payment_methods/_form.html.haml:26 | - exists in en.yml, seems to be a false positive +| all | spree.admin.payment_methods.index.: | app/views/spree/admin/payment_methods/index.html.haml:43 | - exists in en.yml, seems to be a false positive +| all | spree.admin.return_authorizations.states.: | app/views/spree/admin/return_authorizations/edit.html.haml:18 | - opened issue https://github.com/openfoodfoundation/openfoodnetwork/issues/12295 +| all | spree.back_to_states_list | app/views/spree/admin/states/edit.html.haml:10 | - missing translation, added key +| all | spree.country_name | app/views/spree/admin/countries/index.html.haml:14 | - missing translation, added key | all | spree.editing_state | app/views/spree/admin/states/edit.html.haml:4 | -| all | spree.path | app/views/spree/admin/taxons/_taxon_table.html.haml:5 | +| all | spree.path | app/views/spree/admin/taxons/_taxon_table.html.haml:5 | - missing translation, added key | all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | | all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | | all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | From 8f07ff49ac04b27d3bec3a06bf4ba0ed14f103ee Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:02:59 +0000 Subject: [PATCH 10/21] Adds missing keys --- config/locales/en.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index f6910f595b..ead1ed4323 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3886,7 +3886,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using new_taxon: "New taxon" new_user: "New user" no_pending_payments: "No pending payments" - "none": "None" + remove: "Remove" + none: "None" not_found: "Not found" notice_messages: variant_deleted: "Variant deleted" From 8a9b728ac77dd2144b863eec4a3520352c625640 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:03:30 +0000 Subject: [PATCH 11/21] Updates missing translations file --- missing_keys.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/missing_keys.txt b/missing_keys.txt index 7905f278ed..a631909aac 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -44,8 +44,8 @@ | all | spree.country_name | app/views/spree/admin/countries/index.html.haml:14 | - missing translation, added key | all | spree.editing_state | app/views/spree/admin/states/edit.html.haml:4 | | all | spree.path | app/views/spree/admin/taxons/_taxon_table.html.haml:5 | - missing translation, added key -| all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | -| all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | +| all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | - missing translation, added key -> not sure though, where to trigger this missing translation +| all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | - exists in en.yml, seems to be a false positive | all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | | all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | | all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | From a2a951a18edc0f097360c4f52a4bed104ff5fe73 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:05:14 +0000 Subject: [PATCH 12/21] Updates missing translations file --- missing_keys.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/missing_keys.txt b/missing_keys.txt index a631909aac..c112e7d4e4 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -46,7 +46,7 @@ | all | spree.path | app/views/spree/admin/taxons/_taxon_table.html.haml:5 | - missing translation, added key | all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | - missing translation, added key -> not sure though, where to trigger this missing translation | all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | - exists in en.yml, seems to be a false positive -| all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | +| all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | - missing translation, added key | all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | | all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | | all | use_new_cc | app/views/spree/admin/payments/source_forms/_gateway.html.haml:10 | From 08ccdf07c952c88f528d7683129d8a555abda584 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:07:58 +0000 Subject: [PATCH 13/21] Adds missing key thank_you_for_your_order --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index ead1ed4323..18819d9c41 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2630,6 +2630,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using orders_bought_already_confirmed: "* already confirmed" orders_confirm_cancel: "Are you sure you want to cancel this order?" order_processed_successfully: "Your order has been processed successfully" + thank_you_for_your_order: "Thank you for your order" products_cart_distributor_choice: "Distributor for your order:" products_cart_distributor_change: "Your distributor for this order will be changed to %{name} if you add this product to your cart." From 579357dcfae2e49faed8445b20c7f317c6cbea5d Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:09:07 +0000 Subject: [PATCH 14/21] Updates missing translations file --- missing_keys.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/missing_keys.txt b/missing_keys.txt index c112e7d4e4..45be5e7dbf 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -47,7 +47,7 @@ | all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | - missing translation, added key -> not sure though, where to trigger this missing translation | all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | - exists in en.yml, seems to be a false positive | all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | - missing translation, added key -| all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | +| all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | - missing translation, added key | all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | | all | use_new_cc | app/views/spree/admin/payments/source_forms/_gateway.html.haml:10 | | all | what_is_this | app/views/spree/admin/payments/source_forms/_gateway.html.haml:42 | From 4a7cb601e63853d147600c596aa0e8c963741fb0 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:22:05 +0000 Subject: [PATCH 15/21] Added missing keys Adds string to missing key To be squashed --- config/locales/en.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 18819d9c41..2158e4437e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -265,6 +265,10 @@ en: card_details: "Card details" card_type: "Card type" card_type_is: "Card type is" + unrecognized_card_type: "Unrecognized card type" + use_new_cc: "Use a new credit card" + what_is_this: "What is this?" + your_cart_is_empty: "Your cart is empty" cardholder_name: "Cardholder name" community_forum_url: "Community forum URL" customer_instructions: "Customer instructions" From f08c1ca51d6df585f1d052562c63c7328f331ac6 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 20 Mar 2024 17:22:54 +0000 Subject: [PATCH 16/21] Updates missing translations file --- missing_keys.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/missing_keys.txt b/missing_keys.txt index 45be5e7dbf..3c2cde57bb 100644 --- a/missing_keys.txt +++ b/missing_keys.txt @@ -48,8 +48,8 @@ | all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | - exists in en.yml, seems to be a false positive | all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | - missing translation, added key | all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | - missing translation, added key -| all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | -| all | use_new_cc | app/views/spree/admin/payments/source_forms/_gateway.html.haml:10 | -| all | what_is_this | app/views/spree/admin/payments/source_forms/_gateway.html.haml:42 | -| all | your_cart_is_empty | app/views/spree/orders/edit.html.haml:31 | +| all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | - missing translation, added key +| all | use_new_cc | app/views/spree/admin/payments/source_forms/_gateway.html.haml:10 | - missing translation, added key +| all | what_is_this | app/views/spree/admin/payments/source_forms/_gateway.html.haml:42 | - missing translation, added key +| all | your_cart_is_empty | app/views/spree/orders/edit.html.haml:31 | - missing translation, added key +--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ From 83c74bcc77a5081e7b8d4de7328b5811f1f5989d Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Thu, 21 Mar 2024 11:27:35 +0000 Subject: [PATCH 17/21] Updates existing translation on master Done to prevent/fix merge conflicts --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 2158e4437e..f36f33af02 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3910,6 +3910,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using taxonomy_edit: "Taxonomy edit" taxonomy_tree_error: "There was an error updating the taxonomy tree." taxonomy_tree_instruction: "Right-click on an item to add, rename, remove or edit." + taxon_edit: "Taxon edit" tree: "Tree" updating: "Updating" your_order_is_empty_add_product: "Your order is empty, please search for and add a product above" From 269811584bbf6781494f28b9dfc896d1ef3d2fe0 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Thu, 21 Mar 2024 11:46:32 +0000 Subject: [PATCH 18/21] Updates file to latest state Deletes file We only needed this file for tracking progress, during review, we should not keep it in master I think --- missing_keys.txt | 55 ------------------------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 missing_keys.txt diff --git a/missing_keys.txt b/missing_keys.txt deleted file mode 100644 index 3c2cde57bb..0000000000 --- a/missing_keys.txt +++ /dev/null @@ -1,55 +0,0 @@ -+--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ -| Locale | Key | Value in other locales or source | -+--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ -| all | admin.: | app/views/spree/admin/variants/_form.html.haml:11 | = label_tag :unit_value_human, "#{t('admin.'+@product.variant_unit)} ({{unitName(#{@product.variant_unit_scale}, '#{@product.variant_unit}')}})", seems to be a false positive... -| all | admin.customers.index.: | app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee:54 | t('admin.customers.index.' + customer.balance_status), seems to be a false positive... -| all | admin.stripe_connect_settings.edit.instance_publishable_key | app/views/admin/stripe_connect_settings/edit.html.haml:44 | seems missing, added! -| all | card_code | app/views/spree/admin/payments/source_forms/_gateway.html.haml:39 | dynamic key, looks like a false positive. -| all | card_type_is | app/views/spree/admin/payments/source_forms/_gateway.html.haml:23 | key missing from en.yml, added. -| all | checkout.step1.your_details.first_name.label | app/views/checkout/payment/_gateway.html.haml:3 | - seems to be an unused key/file, file removed. -| all | checkout.step1.your_details.first_name.placeholder | app/views/checkout/payment/_gateway.html.haml:4 | - seems to be an unused key/file, file removed. -| all | checkout.step1.your_details.last_name.label | app/views/checkout/payment/_gateway.html.haml:8 | - seems to be an unused key/file, file removed. -| all | checkout.step1.your_details.last_name.placeholder | app/views/checkout/payment/_gateway.html.haml:9 | - seems to be an unused key/file, file removed. -| all | connect_body | app/views/home/_connect.html.haml:5 | - seem to be missing - NEEDS ISSUE -| all | connect_cta | app/views/home/_connect.html.haml:7 | - seem to be missing - NEEDS ISSUE -| all | continue_shopping | app/views/spree/orders/edit.html.haml:32 | - replaced missing keys by existing ones -| all | devise.shared.links.didn_t_receive_confirmation_instructions | app/views/devise/shared/_links.html.erb:14 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 -| all | devise.shared.links.didn_t_receive_unlock_instructions | app/views/devise/shared/_links.html.erb:18 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 -| all | devise.shared.links.forgot_your_password | app/views/devise/shared/_links.html.erb:10 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 -| all | devise.shared.links.sign_in | app/views/devise/shared/_links.html.erb:2 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 -| all | devise.shared.links.sign_up | app/views/devise/shared/_links.html.erb:6 | - unsure, asked here https://github.com/openfoodfoundation/openfoodnetwork/commit/b322df8#commitcomment-139961428 -| all | expiration | app/views/spree/admin/payments/source_forms/_gateway.html.haml:34 | - dynamic key, false positive -| all | footer_links_helper.cookies_policy_link.footer_data_cookies_policy | app/helpers/footer_links_helper.rb:7 | - dynamic key, false positive -| all | footer_links_helper.privacy_policy_link.footer_data_privacy_policy | app/helpers/footer_links_helper.rb:15 | - dynamic key, false positive -| all | inflections | app/assets/javascripts/admin/products/services/option_value_namer.js.coffee:42 | - dynamic key, false positive -| all | js.admin.enterprises.form.images.: | app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee:76 | - dynamic key, false positive -| all | js.admin.orders.order_state.: | app/views/spree/admin/orders/_table_row.html.haml:23 | - dynamic key, false positive -| all | js.admin.orders.payment_states.: | app/views/spree/admin/orders/_table_row.html.haml:28 | - dynamic key, false positive -| all | js.admin.orders.shipment_states.: | app/views/spree/admin/orders/_table_row.html.haml:35 | - dynamic key, false positive -| all | js.subscriptions.: | app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee:10 | - dynamic key, false positive -| all | label_connect | app/views/home/_connect.html.haml:4 | - seem to be missing - NEEDS ISSUE -| all | label_learn | app/views/home/_learn.html.haml:4 | - seem to be missing - NEEDS ISSUE -| all | learn_body | app/views/home/_learn.html.haml:5 | - seem to be missing - NEEDS ISSUE -| all | learn_cta | app/views/home/_learn.html.haml:7 | - seem to be missing - NEEDS ISSUE -| all | meta_description | app/views/spree/admin/taxons/_form.html.haml:20 | - exists in en.yml, seems to be a false positive -| all | meta_keywords | app/views/spree/admin/taxons/_form.html.haml:24 | - exists in en.yml, seems to be a false positive -| all | meta_title | app/views/spree/admin/taxons/_form.html.haml:16 | - exists in en.yml, seems to be a false positive -| all | order_has_no_payments | app/views/spree/admin/payments/index.html.haml:24 | - removed key -| all | order_not_found | app/controllers/spree/orders_controller.rb:63 | - replaced key -| all | paypal.spree.admin.payments.source_forms.paypal.no_payment_via_admin_backend | app/views/spree/admin/payments/source_forms/_paypal.html.haml:2 | - key exists, looks like a false positive -| all | spree.admin.payment_methods.form.: | app/views/spree/admin/payment_methods/_form.html.haml:26 | - exists in en.yml, seems to be a false positive -| all | spree.admin.payment_methods.index.: | app/views/spree/admin/payment_methods/index.html.haml:43 | - exists in en.yml, seems to be a false positive -| all | spree.admin.return_authorizations.states.: | app/views/spree/admin/return_authorizations/edit.html.haml:18 | - opened issue https://github.com/openfoodfoundation/openfoodnetwork/issues/12295 -| all | spree.back_to_states_list | app/views/spree/admin/states/edit.html.haml:10 | - missing translation, added key -| all | spree.country_name | app/views/spree/admin/countries/index.html.haml:14 | - missing translation, added key -| all | spree.editing_state | app/views/spree/admin/states/edit.html.haml:4 | -| all | spree.path | app/views/spree/admin/taxons/_taxon_table.html.haml:5 | - missing translation, added key -| all | spree.remove | app/views/spree/admin/taxons/_taxon_table.html.haml:15 | - missing translation, added key -> not sure though, where to trigger this missing translation -| all | spree.shipment_mailer.base_subject.picked_up_subject | app/mailers/spree/shipment_mailer.rb:15 | - exists in en.yml, seems to be a false positive -| all | spree.taxon_edit | app/views/spree/admin/taxons/edit.html.haml:4 | - missing translation, added key -| all | thank_you_for_your_order | app/views/spree/orders/show.html.haml:26 | - missing translation, added key -| all | unrecognized_card_type | app/views/spree/admin/payments/source_forms/_gateway.html.haml:25 | - missing translation, added key -| all | use_new_cc | app/views/spree/admin/payments/source_forms/_gateway.html.haml:10 | - missing translation, added key -| all | what_is_this | app/views/spree/admin/payments/source_forms/_gateway.html.haml:42 | - missing translation, added key -| all | your_cart_is_empty | app/views/spree/orders/edit.html.haml:31 | - missing translation, added key -+--------+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+ From d2c2e208226ecf3b5ca7fbac0e29552afb0d5099 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Fri, 22 Mar 2024 13:07:45 +0000 Subject: [PATCH 19/21] Removes #connect.pane files _learn and _connect seem to appear at the top of the homepage (and not as pane). Also, there was some hard coded URLs which seems not to be used, as the translations in the Configuration/Content section seem to work correctly. --- app/views/home/_connect.html.haml | 7 ------- app/views/home/_learn.html.haml | 7 ------- 2 files changed, 14 deletions(-) delete mode 100644 app/views/home/_connect.html.haml delete mode 100644 app/views/home/_learn.html.haml diff --git a/app/views/home/_connect.html.haml b/app/views/home/_connect.html.haml deleted file mode 100644 index 6afcb1ae96..0000000000 --- a/app/views/home/_connect.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -#connect.pane - .row - .small-12.medium-6.medium-offset-3.columns.text-center - %h2= t :label_connect - %p.text-normal= t :connect_body - %a.button.transparent{href: "https://openfoodnetwork.org/au/connect/"} - = t :connect_cta diff --git a/app/views/home/_learn.html.haml b/app/views/home/_learn.html.haml deleted file mode 100644 index f6d3061e20..0000000000 --- a/app/views/home/_learn.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -#learn.pane - .row - .small-12.medium-6.medium-offset-3.columns.text-center - %h2= t :label_learn - %p.text-normal= t :learn_body - %a.button.transparent{href: "https://openfoodnetwork.org/au/learn/"} - = t :learn_cta From bfd4b730f29d52c7e33568a2a4123e7104a21b75 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 15 Apr 2024 15:07:31 +0100 Subject: [PATCH 20/21] Combines keys taxon_edit and taxonomy_edit --- app/views/spree/admin/taxons/edit.html.haml | 2 +- config/locales/en.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/spree/admin/taxons/edit.html.haml b/app/views/spree/admin/taxons/edit.html.haml index efb5c29e91..1df6e7288f 100644 --- a/app/views/spree/admin/taxons/edit.html.haml +++ b/app/views/spree/admin/taxons/edit.html.haml @@ -1,7 +1,7 @@ = render partial: 'spree/admin/shared/configuration_menu' - content_for :page_title do - = t("spree.taxon_edit") + = t("spree.taxonomy_edit") - content_for :page_actions do %li diff --git a/config/locales/en.yml b/config/locales/en.yml index f36f33af02..2158e4437e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3910,7 +3910,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using taxonomy_edit: "Taxonomy edit" taxonomy_tree_error: "There was an error updating the taxonomy tree." taxonomy_tree_instruction: "Right-click on an item to add, rename, remove or edit." - taxon_edit: "Taxon edit" tree: "Tree" updating: "Updating" your_order_is_empty_add_product: "Your order is empty, please search for and add a product above" From 91769574e39e7e31f417e177901900ac7feff2a6 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 15 Apr 2024 15:16:30 +0100 Subject: [PATCH 21/21] Removes unecessary key your_cart_is_empty --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 2158e4437e..662b5fe984 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -268,7 +268,6 @@ en: unrecognized_card_type: "Unrecognized card type" use_new_cc: "Use a new credit card" what_is_this: "What is this?" - your_cart_is_empty: "Your cart is empty" cardholder_name: "Cardholder name" community_forum_url: "Community forum URL" customer_instructions: "Customer instructions"