rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

fix currentUser value after successfull sign up when confirmation is needed, plus improves translations

Browse Source
This commit is contained in:
Nicolas Florentin 2019-12-30 13:45:25 +01:00
parent 6550428f72
commit 60e063a15b
9 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/controllers/application.js.erb
View File

@ -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

1
config/locales/app.public.en.yml
View File

@ -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"

1
config/locales/app.public.es.yml
View File

@ -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"

1
config/locales/app.public.fr.yml
View File

@ -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"

1
config/locales/app.public.pt.yml
View File

@ -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"

2
config/locales/devise.en.yml
View File

@ -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:

2
config/locales/devise.es.yml
View File

@ -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:

2
config/locales/devise.fr.yml
View File

@ -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 !"

2
config/locales/devise.pt.yml
View File

@ -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: