From 642d3cbfbd67acdfe4a69b250b7ee4dd43252359 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Jun 2019 14:19:56 +0100 Subject: [PATCH 1/4] Fix translation key namespace in subs order confirm email subject --- app/mailers/subscription_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb index 0046155499..e2216c01c9 100644 --- a/app/mailers/subscription_mailer.rb +++ b/app/mailers/subscription_mailer.rb @@ -48,7 +48,7 @@ class SubscriptionMailer < Spree::BaseMailer def send_mail(order) I18n.with_locale valid_locale(order.user) do - confirm_email_subject = t('order_mailer.confirm_email.subject') + confirm_email_subject = t('spree.order_mailer.confirm_email.subject') subject = "#{Spree::Config[:site_name]} #{confirm_email_subject} ##{order.number}" mail(to: order.email, from: from_address, From b372e131a13f65bae27b1cd2d4bb37fbb1b6791f Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Jun 2019 14:27:27 +0100 Subject: [PATCH 2/4] Add missing translation key in Spree. This was fixed in spree 2.1, https://github.com/spree/spree/commit/7de7fcd5021fd8ccdc78f25c702725daffd4b01e --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6ec88c03fd..f74f8b3a27 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2321,6 +2321,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using payment_methods: "Payment Methods" payment_method_fee: "Transaction fee" payment_processing_failed: "Payment could not be processed, please check the details you entered" + payment_method_not_supported: "That payment method is unsupported. Please choose another one." payment_updated: "Payment Updated" inventory_settings: "Inventory Settings" tag_rules: "Tag Rules" From 043abdef3939b328869c9e3774a8c74ba207375c Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Jun 2019 14:47:44 +0100 Subject: [PATCH 3/4] Add missing translations in the account confirmation process --- config/locales/en.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index f74f8b3a27..e8b8aadd5d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -96,6 +96,11 @@ en: resend_confirmation_email: "Resend confirmation email." confirmed: "Thanks for confirming your email! You can now log in." not_confirmed: "Your email address could not be confirmed. Perhaps you have already completed this step?" + user_confirmations: + spree_user: + send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." + confirmation_sent: "Email confirmation sent" + confirmation_not_sent: "Error sending confirmation email" user_registrations: spree_user: signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account." From 0235a04530f663d14421a0c7f133e73cb3bcbff3 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Jun 2019 14:53:22 +0100 Subject: [PATCH 4/4] Add missing translation key in user sessins controller --- app/controllers/spree/user_sessions_controller_decorator.rb | 2 +- config/locales/en.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/spree/user_sessions_controller_decorator.rb b/app/controllers/spree/user_sessions_controller_decorator.rb index 72dc8b6d14..cdc202cca5 100644 --- a/app/controllers/spree/user_sessions_controller_decorator.rb +++ b/app/controllers/spree/user_sessions_controller_decorator.rb @@ -7,7 +7,7 @@ Spree::UserSessionsController.class_eval do if spree_user_signed_in? respond_to do |format| format.html { - flash[:success] = t(:logged_in_succesfully) + flash[:success] = t('devise.success.logged_in_succesfully') redirect_back_or_default(after_sign_in_path_for(spree_current_user)) } format.js { diff --git a/config/locales/en.yml b/config/locales/en.yml index e8b8aadd5d..3f7f29705c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -111,6 +111,8 @@ en: Were you a guest last time? Perhaps you need to create an account or reset your password. unconfirmed: "You have to confirm your account before continuing." already_registered: "This email address is already registered. Please log in to continue, or go back and use another email address." + success: + logged_in_succesfully: "Logged in successfully" user_passwords: spree_user: updated_not_active: "Your password has been reset, but your email has not been confirmed yet."