fix: Improved translations

Author: Zenoo

server/i18n/en.json

@@ -2,15 +2,21 @@
   "noIDProvided": "No ID provided",
   "nothingToExport": "Nothing to export",
   "unauthorized": "Unauthorized",
+  "missingLogin": "Missing login",
   "missingPassword": "Missing password",
+  "missingToken": "Missing token",
   "passwordUpdated": "Password updated",
-  "tokenExpired": "Token expired",
+  "sessionExpiredPleaseReconnect": "Session expired, please reconnect",
   "invalidPassword": "Invalid password",
+  "resetPasswordEmail": "Reset password email",
+  "cannotSendOldPassword": "We cannot simply send you your old password. A unique link to reset your password has been generated for you. To reset your password, click the following button and follow the instructions.",
+  "resetPassword": "Reset password",
   "passwordResetMessage": "If the button doesnt work copy and paste the following in your browser",
   "resetYourPassword": "Reset your password",
   "clickLinkToResetPassword": "Click the following link to reset your password",
   "emailNotSent": "Email not sent",
   "emailSent": "Email sent",
   "tokenValid": "Token valid",
-  "invalidToken": "Invalid token"
+  "invalidToken": "Invalid token",
+  "unableToConnectToMailServer": "Unable to connect to mail server"
 }

server/i18n/fr.json

@@ -2,15 +2,21 @@
   "noIDProvided": "ID manquant",
   "nothingToExport": "Rien à exporter",
   "unauthorized": "Non autorisé",
+  "missingLogin": "Identifiant manquant",
   "missingPassword": "Mot de passe manquant",
+  "missingToken": "Token manquant",
   "passwordUpdated": "Mot de passe mis à jour avec succès",
-  "tokenExpired": "Token expiré",
+  "sessionExpiredPleaseReconnect": "Session expirée, veuillez vous reconnecter",
   "invalidPassword": "Mot de passe invalide",
+  "resetPasswordEmail": "Email de réinitialisation de mot de passe",
+  "cannotSendOldPassword": "Nous ne pouvons pas simplement vous envoyer votre ancien mot de passe. Un lien unique pour réinitialiser votre mot de passe a été généré pour vous. Pour réinitialiser votre mot de passe, cliquez sur le bouton suivant et suivez les instructions.",
+  "resetPassword": "Réinitialiser le mot de passe",
   "passwordResetMessage": "Si le bouton ne fonctionne pas, copiez et collez ce qui suit dans votre navigateur",
   "resetYourPassword": "Réinitialiser votre mot de passe",
   "clickLinkToResetPassword": "Cliquez sur le lien suivant pour réinitialiser votre mot de passe",
   "emailNotSent": "Email non envoyé",
   "emailSent": "Email envoyé",
   "tokenValid": "Token valide",
-  "invalidToken": "Token invalide"
+  "invalidToken": "Token invalide",
+  "unableToConnectToMailServer": "Impossible de se connecter au serveur de messagerie"
 }

server/src/controllers/Users.ts

@@ -25,11 +25,11 @@ const authenticate = (prisma: PrismaClient) => async (
     const { login, password } = req.body;
 
     if (!login) {
-      throw new Error('Missing Login');
+      throw new Error(t('missingLogin'));
     }
 
     if (!password) {
-      throw new Error('Missing Password');
+      throw new Error(t('missingPassword'));
     }
 
     const user = await prisma.user.findFirstOrThrow({
@@ -53,7 +53,7 @@ const authenticate = (prisma: PrismaClient) => async (
       }
 
       // Token is expired, throw error
-      throw new Error(t('tokenExpired'));
+      throw new Error(t('sessionExpiredPleaseReconnect'));
     }
 
     // Check password against DB
@@ -159,16 +159,13 @@ const sendPasswordResetEmail = (prisma: PrismaClient) => async (
     // Reset URL
     const url = `${req.protocol}://${req.hostname}/login?login=${encodeURIComponent(user.login)}&reset=${encodeURIComponent(token)}`;
 
-    // Mail message
-    const message = t('passwordResetMessage');
-
     // Send email
     const mailInfo = await MailUtils.sendMail({
       from: MAIL_SENDER,
       to: user.person.email,
       subject: t('resetYourPassword'),
       text: `${t('clickLinkToResetPassword')}: ${url}`,
-      html: MailUtils.passwordResetTemplate(url, message),
+      html: MailUtils.passwordResetTemplate(url),
     });
 
     if (mailInfo.accepted.length === 0) {
@@ -229,15 +226,15 @@ const resetPassword = (prisma: PrismaClient) => async (
     const { code, login, password } = req.body;
 
     if (!code) {
-      throw new Error('Missing token');
+      throw new Error(t('missingToken'));
     }
 
     if (!login) {
-      throw new Error('Missing login');
+      throw new Error(t('missingLogin'));
     }
 
     if (!password) {
-      throw new Error('Missing password');
+      throw new Error(t('missingPassword'));
     }
 
     const user = await prisma.user.findFirstOrThrow({

server/src/utils/MailUtils.ts

@@ -1,3 +1,4 @@
+import { t } from 'i18next';
 import { createTransport } from 'nodemailer';
 import Mail from 'nodemailer/lib/mailer';
 
@@ -83,12 +84,12 @@ ${action}
  * @param url
  * @param message
  */
-const passwordResetTemplate = (url: string, message: string) => /* html */`<!DOCTYPE html>
+const passwordResetTemplate = (url: string) => /* html */`<!DOCTYPE html>
 <html lang="en-US">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<title>Reset Password Email</title>
-<meta name="description" content="Reset Password Email Template." />
+<title>${t('resetPasswordEmail')}</title>
+<meta name="description" content="${t('resetPasswordEmail')}" />
 <style type="text/css">
 a:hover {
 text-decoration: underline !important;
@@ -125,16 +126,16 @@ text-align: center; -webkit-box-shadow: 0 6px 18px 0 rgba(0, 0, 0, 0.06); -moz-b
 <h1 style="color: #1e1e2d; font-weight: 500; margin: 0; font-size: 32px; font-family: 'Rubik', sans-serif;">You have requested to reset your password</h1>
 <span style="display: inline-block; vertical-align: middle; margin: 29px 0 26px; border-bottom: 1px solid #cecece; width: 100px;"></span>
 <p style="color: #455056; font-size: 15px; line-height: 24px; margin: 0;">
-We cannot simply send you your old password. A unique link to reset your password has been generated for you. To reset your password, click the following button and follow the instructions.
+${t('cannotSendOldPassword')}
 </p>
 <a href="${url}" style=" background: #3f51b5; text-decoration: none !important; font-weight: 500; margin-top: 35px; color: #fff;
 text-transform: uppercase; font-size: 14px; padding: 10px 24px; display: inline-block; border-radius: 50px; ">
-Reset Password
+${t('resetPassword')}
 </a>
 <br/>
 <span style="height: 40px;">&nbsp;</span>
 <p style="color: #455056; font-size: 15px; line-height: 24px; margin: 0;">
-${message} :
+${t('passwordResetMessage')} :
 <a href="${url}">${url}</a>
 </p>
 </td>
@@ -175,7 +176,7 @@ const sendMail = async (mailOptions: Mail.Options) => {
   const connected = await transporter.verify();
 
   if (!connected) {
-    throw new Error('Unable to connect to mail server');
+    throw new Error(t('unableToConnectToMailServer'));
   }
 
   // Send mail