API & Client - complete users administration

fittrackee_client/src/locales/en/administration.json

@@ -1,5 +1,7 @@
 {
   "ACTION": "Action",
+  "ACTIVATE_USER_ACCOUNT": "Activate account",
+  "ACTIVE": "Active",
   "ADMIN_RIGHTS_DELETE_USER_ACCOUNT": "Add/remove admin rights, delete user account.",
   "ADMIN": "Admin",
   "ADMINISTRATION": "Administration",
@@ -15,8 +17,10 @@
   "BACK_TO_ADMIN": "Back to admin",
   "CONFIRM_USER_ACCOUNT_DELETION": "Are you sure you want to delete {0} account? All data will be deleted, this cannot be undone.",
   "CONFIRM_USER_PASSWORD_RESET": "Are you sure you want to reset {0} password?",
+  "CURRENT_EMAIL": "Current email",
   "DELETE_USER": "Delete user",
   "ENABLE_DISABLE_SPORTS": "Enable/disable sports.",
+  "NEW_EMAIL": "New email",
   "PASSWORD_RESET_SUCCESSFUL": "The password has been reset.",
   "REGISTRATION_DISABLED": "Registration is currently disabled.",
   "REGISTRATION_ENABLED": "Registration is currently enabled.",
@@ -31,7 +35,9 @@
     "TITLE": "Sports administration"
   },
   "UPDATE_APPLICATION_DESCRIPTION": "Update application configuration (maximum number of registered users, maximum files size).",
+  "UPDATE_USER_EMAIL": "Update email",
   "USER": "user | users",
+  "USER_EMAIL_UPDATE_SUCCESSFUL": "The email address has been updated.",
   "USERS": {
     "TABLE": {
       "ADD_ADMIN_RIGHTS": "Add admin rights",

fittrackee_client/src/locales/en/api.json

@@ -13,6 +13,7 @@
     "invalid token, please log in again": "Invalid token, please log in again.",
     "invalid token, please request a new token": "Invalid token, please log in again.",
     "Network Error": "Network Error.",
+    "new email must be different than curent email": "The new email must be different than curent email",
     "no file part": "No file provided.",
     "no selected file": "No selected file.",
     "password: password and password confirmation do not match": "Password: password and password confirmation don't match.",

fittrackee_client/src/locales/en/user.json

@@ -100,6 +100,7 @@
   "REGISTER_DISABLED": "Sorry, registration is disabled.",
   "RESET_PASSWORD": "Reset your password",
   "SHOW_PASSWORD": "show password",
+  "THIS_USER_ACCOUNT_IS_INACTIVE": "This user account is inactive.",
   "USER_PICTURE": "user picture",
   "USERNAME": "Username",
   "USERNAME_INFO": "3 to 30 characters required, only alphanumeric characters and the underscore character \"_\" allowed."

fittrackee_client/src/locales/fr/administration.json

@@ -1,5 +1,7 @@
 {
   "ACTION": "Action",
+  "ACTIVATE_USER_ACCOUNT": "Activer le compte",
+  "ACTIVE": "Actif",
   "ADMIN_RIGHTS_DELETE_USER_ACCOUNT": "Ajouter/retirer des droits d'administration, supprimer des comptes utilisateurs.",
   "ADMIN": "Admin",
   "ADMINISTRATION": "Administration",
@@ -15,8 +17,10 @@
   "BACK_TO_ADMIN": "Revenir à l'admin",
   "CONFIRM_USER_ACCOUNT_DELETION": "Êtes-vous sûr de vouloir supprimer le compte de l'utilisateur {0} ? Toutes les données seront définitivement.",
   "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",
   "ENABLE_DISABLE_SPORTS": "Activer/désactiver des sports.",
+  "NEW_EMAIL": "Nouvelle adresse email",
   "PASSWORD_RESET_SUCCESSFUL": "Le mot de passe a été réinitialisé.",
   "REGISTRATION_DISABLED": "Les inscriptions sont actuellement désactivées.",
   "REGISTRATION_ENABLED": "Les inscriptions sont actuellement activées.",
@@ -31,7 +35,9 @@
     "TITLE": "Administration - Sports"
   },
   "UPDATE_APPLICATION_DESCRIPTION": "Configurer l'application (nombre maximum d'utilisateurs inscrits, taille maximale des fichers).",
+  "UPDATE_USER_EMAIL": "Changer l'email",
   "USER": "utilisateur | utilisateurs",
+  "USER_EMAIL_UPDATE_SUCCESSFUL": "L'adresse email a été mise à jour.",
   "USERS": {
     "TABLE": {
       "ADD_ADMIN_RIGHTS": "Ajouter les drois d'admin",

fittrackee_client/src/locales/fr/api.json

@@ -15,6 +15,7 @@
     "no file part": "Pas de fichier fourni.",
     "no selected file": "Pas de fichier sélectionné.",
     "Network Error": "Erreur Réseau.",
+    "new email must be different than curent email": "La nouvelle addresse email doit être differente de l'adresse actuelle",
     "password: password and password confirmation do not match": "Mot de passe : les mots de passe saisis sont différents.",
     "provide a valid auth token": "Merci de fournir un jeton de connexion valide.",
     "sport does not exist": "Ce sport n'existe pas.",

fittrackee_client/src/locales/fr/user.json

@@ -99,6 +99,7 @@
   "RESENT_ACCOUNT_CONFIRMATION": "Envoyer à nouveau l'email de confirmation de compte",
   "RESET_PASSWORD": "Réinitialiser votre mot de passe",
   "SHOW_PASSWORD": "afficher le mot de passe",
+  "THIS_USER_ACCOUNT_IS_INACTIVE": "Le compte de cet utilisateur est inactif.",
   "USER_PICTURE": "photo de l'utilisateur",
   "USERNAME": "Nom d'utilisateur",
   "USERNAME_INFO": "3 à 30 caractères requis, seuls les caractères alphanumériques et le caractère \"_\" sont autorisés."