+
{{ $t('user.ACCOUNT_CONFIRMATION_NOT_RECEIVED') }}
@@ -175,6 +195,11 @@
() =>
props.action === 'register' && !appConfig.value.is_registration_enabled
)
+ const sendingEmailDisabled: ComputedRef = computed(
+ () =>
+ ['reset-request', 'account-confirmation-resend'].includes(props.action) &&
+ !appConfig.value.is_email_sending_enabled
+ )
const formErrors = ref(false)
function getButtonText(action: string): string {
diff --git a/fittrackee_client/src/locales/en/administration.json b/fittrackee_client/src/locales/en/administration.json
index 5e081791..f768d123 100644
--- a/fittrackee_client/src/locales/en/administration.json
+++ b/fittrackee_client/src/locales/en/administration.json
@@ -21,6 +21,7 @@
"CONFIRM_USER_PASSWORD_RESET": "Are you sure you want to reset {0} password?",
"CURRENT_EMAIL": "Current email",
"DELETE_USER": "Delete user",
+ "EMAIL_SENDING_DISABLED": "Email sending is disabled.",
"ENABLE_DISABLE_SPORTS": "Enable/disable sports.",
"NEW_EMAIL": "New email",
"PASSWORD_RESET_SUCCESSFUL": "The password has been reset.",
diff --git a/fittrackee_client/src/locales/en/api.json b/fittrackee_client/src/locales/en/api.json
index 94574792..8a0ff3b4 100644
--- a/fittrackee_client/src/locales/en/api.json
+++ b/fittrackee_client/src/locales/en/api.json
@@ -23,7 +23,7 @@
"signature expired, please log in again": "Signature expired. Please log in again.",
"successfully registered": "Successfully registered.",
"user does not exist": "User does not exist.",
- "valid email must be provided for admin contact": "A valid email must be provided for admininstrator contact",
+ "valid email must be provided for admin contact": "A valid email must be provided for administrator contact",
"you can not delete your account, no other user has admin rights": "You can not delete your account, no other user has admin rights.",
"you do not have permissions": "You do not have permissions."
},
diff --git a/fittrackee_client/src/locales/en/user.json b/fittrackee_client/src/locales/en/user.json
index 86808f55..23f9fb55 100644
--- a/fittrackee_client/src/locales/en/user.json
+++ b/fittrackee_client/src/locales/en/user.json
@@ -86,7 +86,8 @@
"STOPPED_SPEED_THRESHOLD": "stopped speed threshold"
},
"SUCCESSFUL_EMAIL_UPDATE": "Your account has been updated successfully. Please check your email to confirm your new email address.",
- "SUCCESSFUL_REGISTRATION": "A link to activate your account has been emailed to the address provided.",
+ "SUCCESSFUL_REGISTRATION": "Your account has been created successfully.",
+ "SUCCESSFUL_REGISTRATION_WITH_EMAIL": "A link to activate your account has been emailed to the address provided.",
"SUCCESSFUL_UPDATE": "Your account has been updated successfully.",
"UNITS": {
"LABEL": "Units for distance",
diff --git a/fittrackee_client/src/locales/fr/administration.json b/fittrackee_client/src/locales/fr/administration.json
index 9552de91..9e845fc2 100644
--- a/fittrackee_client/src/locales/fr/administration.json
+++ b/fittrackee_client/src/locales/fr/administration.json
@@ -21,6 +21,7 @@
"CONFIRM_USER_PASSWORD_RESET": "Êtes-vous sûr de vouloir réinitialiser le mot de passe de l'utilisateur {0} ?",
"CURRENT_EMAIL": "Adresse email actuelle",
"DELETE_USER": "Supprimer l'utilisateur",
+ "EMAIL_SENDING_DISABLED": "L'envoi d'emails est désactivé.",
"ENABLE_DISABLE_SPORTS": "Activer/désactiver des sports.",
"NEW_EMAIL": "Nouvelle adresse email",
"PASSWORD_RESET_SUCCESSFUL": "Le mot de passe a été réinitialisé.",
diff --git a/fittrackee_client/src/locales/fr/user.json b/fittrackee_client/src/locales/fr/user.json
index 97039160..091cb4d0 100644
--- a/fittrackee_client/src/locales/fr/user.json
+++ b/fittrackee_client/src/locales/fr/user.json
@@ -91,7 +91,8 @@
"STOPPED_SPEED_THRESHOLD": "seuil de vitesse arrêtée"
},
"SUCCESSFUL_EMAIL_UPDATE": "Votre compte a été modifié avec succès. Veuillez vérifier votre boite email pour valider votre nouvelle adresse email.",
- "SUCCESSFUL_REGISTRATION": "Un lien pour activer votre compte a été envoyé à l'adresse email fournie.",
+ "SUCCESSFUL_REGISTRATION": "Votre compte a été créé avec succès.",
+ "SUCCESSFUL_REGISTRATION_WITH_EMAIL": "Un lien pour activer votre compte a été envoyé à l'adresse email fournie.",
"SUCCESSFUL_UPDATE": "Votre compte a été modifié avec succès.",
"TIMEZONE": "Fuseau horaire"
},
diff --git a/fittrackee_client/src/types/application.ts b/fittrackee_client/src/types/application.ts
index 87e01d63..b15b0c0a 100644
--- a/fittrackee_client/src/types/application.ts
+++ b/fittrackee_client/src/types/application.ts
@@ -9,6 +9,7 @@ export type TAppConfig = {
[key: string]: number | boolean | string
admin_contact: string
gpx_limit_import: number
+ is_email_sending_enabled: boolean
is_registration_enabled: boolean
map_attribution: string
max_single_file_size: number