diff --git a/app/assets/javascripts/controllers/application.js.erb b/app/assets/javascripts/controllers/application.js.erb index d9770ca0a..249efb8fc 100644 --- a/app/assets/javascripts/controllers/application.js.erb +++ b/app/assets/javascripts/controllers/application.js.erb @@ -169,7 +169,12 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco }] }).result['finally'](null).then(function (user) { // when the account was created successfully, set the session to the newly created account - $scope.setCurrentUser(user); + if(Fablab.userConfirmationNeededToSignIn) { + Auth._currentUser = null; + growl.info(_t('app.public.common.you_will_receive_confirmation_instructions_by_email_detailed')); + } else { + $scope.setCurrentUser(user); + } }); <% end %> }; @@ -447,7 +452,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco }); }; }] - }).result['finally'](null).then(function () { growl.info(_t('app.public.common.you_will_receive_in_a_moment_an_email_with_the_confirmation_link')); }); + }).result['finally'](null).then(function () { growl.info(_t('app.public.common.you_will_receive_confirmation_instructions_by_email_detailed')); }); } }); // otherwise the user just closed the modal diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 53f08c551..97a713f35 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -98,6 +98,7 @@ en: used_for_reservation: "This data will be used in case of change on one of your bookings" used_for_profile: "This data will only be displayed on your profile" public_profile: "You will have a public profile and other users will be able to associate you in their projects" + you_will_receive_confirmation_instructions_by_email_detailed: "You will receive an email with instructions about how to confirm your account in a few minutes." # password modification modal change_your_password: "Change your password" diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index a641da12b..367b1d75a 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -98,6 +98,7 @@ es: used_for_reservation: "This data will be used in case of change on one of your bookings" used_for_profile: "This data will only be displayed on your profile" public_profile: "You will have a public profile and other users will be able to associate you in their projects" + you_will_receive_confirmation_instructions_by_email_detailed: "Recibirá un correo electrónico con instrucciones sobre cómo confirmar su cuenta en unos minutos." # password modification modal change_your_password: "Cambiar contraseña" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 8d2bba1cf..1bc82bae2 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -98,6 +98,7 @@ fr: used_for_reservation: "Cette donnée sera utilisée en cas de changement sur une de vos réservations" used_for_profile: "Cette donnée sera seulement affichée sur votre profil" public_profile: "Vous aurez un profil public et les autres utilisateurs pourront vous associer à leurs projets" + you_will_receive_confirmation_instructions_by_email_detailed: "Vous allez recevoir dans quelques minutes un email comportant des instructions pour confirmer votre compte." # fenêtre de changement de mot de passe change_your_password: "Modifier votre mot de passe" diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index c985fd76e..2d6284a54 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -98,6 +98,7 @@ pt: used_for_reservation: "This data will be used in case of change on one of your bookings" used_for_profile: "This data will only be displayed on your profile" public_profile: "You will have a public profile and other users will be able to associate you in their projects" + you_will_receive_confirmation_instructions_by_email_detailed: "Você receberá um email com instruções sobre como confirmar sua conta em alguns minutos." # password modification modal change_your_password: "Mudar sua senha" diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index aaf3be8c6..b0ccd6ec1 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -15,7 +15,7 @@ en: not_found_in_database: "Invalid email or password." timeout: "Your session expired. Please sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." - unconfirmed: "You have to confirm your account before continuing." + unconfirmed: "You have to confirm your account before continuing. Please click on the link below the form." mailer: confirmation_instructions: action: diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml index 1e7630fcc..edd45da3d 100644 --- a/config/locales/devise.es.yml +++ b/config/locales/devise.es.yml @@ -15,7 +15,7 @@ es: not_found_in_database: "mail o contraseña inválidos." timeout: "Su sesión ha expirado. Por favor, inicie sesión de nuevo." unauthenticated: "Necesita iniciar sesión o registrarse antes de contiunar." - unconfirmed: "Debe confirmar su cuenta antes de continuar." + unconfirmed: "Debe confirmar su cuenta antes de continuar. Por favor haga clic en el enlace abajo del formulario." mailer: confirmation_instructions: action: diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index 9c1288378..861b32de2 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -15,7 +15,7 @@ fr: not_found_in_database: "E-mail ou mot de passe incorrect." timeout: "Votre session est périmée, veuillez vous reconnecter pour continuer." unauthenticated: "Vous devez vous connecter ou vous enregistrer pour continuer." - unconfirmed: "Vous devez confirmer votre adresse de courriel pour pouvoir vous connecter." + unconfirmed: "Vous devez confirmer votre adresse de courriel pour pouvoir vous connecter. Veuillez cliquer sur le lien en dessous du formulaire." mailer: confirmation_instructions: action: "Confirmer mon e-mail !" diff --git a/config/locales/devise.pt.yml b/config/locales/devise.pt.yml index 377f8e15a..5781441f8 100755 --- a/config/locales/devise.pt.yml +++ b/config/locales/devise.pt.yml @@ -15,7 +15,7 @@ pt: not_found_in_database: "Email ou senha inválidos." timeout: "Sua sessão expirou, faça login novamente para continuar." unauthenticated: "Você precisa fazer login ou se registrar, antes de continuar." - unconfirmed: "Você precisa confirmar sua conta, antes de continuar." + unconfirmed: "Você precisa confirmar sua conta, antes de continuar. Por favor, clique no link abaixo do formulário." mailer: confirmation_instructions: action: