Improvements to links in emails; more translations.

TiBiBa · Jan 21, 2021 · a11af4f · a11af4f
1 parent 8168949
commit a11af4f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/auth.py b/auth.py
@@ -400,7 +400,7 @@ def send_email_template (template, email, lang, link):
     body = texts ['email_' + template + '_body'].split ('\n')
     body = [texts ['email_hello']] + body
     if link:
-        body = body + ['@@LINK@@']
+        body [len (body) - 1] = body [len (body ) - 1] + ' @@LINK@@'
     body = body + texts ['email_goodbye'].split ('\n')
 
     body_plain = '\n'.join (body)

diff --git a/coursedata/texts/en.yaml b/coursedata/texts/en.yaml
@@ -82,12 +82,12 @@ Auth:
   exists_username: "That username is already in use."
   email_hello: "Hi!"
   email_goodbye: "Thank you!\nThe Hedy team"
-  email_welcome_verify_subject: "Your Hedy account has been created"
-  email_welcome_verify_body: "Your Hedy account has been created successfully. Welcome!\nPlease click on the link below to verify your email address."
+  email_welcome_verify_subject: "Welcome to Hedy"
+  email_welcome_verify_body: "Your Hedy account has been created successfully. Welcome!\nPlease click on this link to verify your email address:"
   email_change_password_subject: "Your Hedy password has been changed"
   email_change_password_body: "Your Hedy password has been changed. If you did this, all is good.\nIf you didn't change your password, please contact us immediately by replying to this email."
   email_recover_password_subject: "Reset your Hedy password"
-  email_recover_password_body: "By clicking the link below, you can set a new Hedy password. If you haven't required a password reset, please ignore this email."
+  email_recover_password_body: "By clicking on this link, you can set a new Hedy password. If you haven't required a password reset, please ignore this email."
   email_reset_password_subject: "Your Hedy password has been resetted"
   email_reset_password_body: "Your Hedy password has been resetted to a new one. If you did this, all is good.\nIf you didn't change your password, please contact us immediately by replying to this email."
   # These variables are added here to make the code simpler, but conceptually they belong elsewhere

diff --git a/coursedata/texts/es.yaml b/coursedata/texts/es.yaml
@@ -82,12 +82,12 @@ Auth:
   exists_username: "Ese nombre de usuario ya está en uso."
   email_hello: "¡Hola!"
   email_goodbye: "¡Gracias!\nEl equipo de Hedy"
-  email_welcome_verify_subject: "Tu cuenta de Hedy ha sido creada"
-  email_welcome_verify_body: "Tu cuenta de Hedy ha sido creada exitosamente. ¡Bienvenid@!\nPor favor haz click en el link debajo para verificar tu dirección de correo electrónico."
+  email_welcome_verify_subject: "Bienvenido a Hedy"
+  email_welcome_verify_body: "Tu cuenta de Hedy ha sido creada exitosamente. ¡Bienvenid@!\nPor favor haz click en este enlace para verificar tu dirección de correo electrónico:"
   email_change_password_subject: "Tu contraseña de Hedy ha sido cambiada"
   email_change_password_body: "Tu contraseña de Hedy ha sido cambiada. Si tú has hecho esto, todo marcha bien.\nSi tú no has realizado esta acción, por favor contáctanos inmediatamente respondiendo a este correo electrónico."
   email_recover_password_subject: "Reestablecer tu contraseña de Hedy"
-  email_recover_password_body: "Haciendo click en el link debajo, puedes reestablecer tu contraseña de Hedy. Si tú no has requerido reestablecer tu contraseña de Hedy, por favor ignora este correo electrónico."
+  email_recover_password_body: "Haciendo click en el siguiente enlace, puedes reestablecer tu contraseña de Hedy. Si tú no has requerido reestablecer tu contraseña de Hedy, por favor ignora este correo electrónico:"
   email_reset_password_subject: "Tu contraseña de Hedy se ha reestablecido"
   email_reset_password_body: "Tu contraseña de Hedy se ha reestablecido. Si tú has hecho esto, todo marcha bien.\nSi tú no has reestablecido tu contraseña, por favor contáctanos inmediataamente respondiendo a este correo electrónico."
   # These variables are added here to make the code simpler, but conceptually they belong elsewhere

diff --git a/coursedata/texts/fr.yaml b/coursedata/texts/fr.yaml
@@ -93,12 +93,12 @@ Auth:
   exists_username: "That username is already in use."
   email_hello: "Hi!"
   email_goodbye: "Thank you!\nThe Hedy team"
-  email_welcome_verify_subject: "Your Hedy account has been created"
-  email_welcome_verify_body: "Your Hedy account has been created successfully. Welcome!\nPlease click on the link below to verify your email address."
+  email_welcome_verify_subject: "Welcome to Hedy"
+  email_welcome_verify_body: "Your Hedy account has been created successfully. Welcome!\nPlease click on this link to verify your email address:"
   email_change_password_subject: "Your Hedy password has been changed"
   email_change_password_body: "Your Hedy password has been changed. If you did this, all is good.\nIf you didn't change your password, please contact us immediately by replying to this email."
   email_recover_password_subject: "Reset your Hedy password"
-  email_recover_password_body: "By clicking the link below, you can set a new Hedy password. If you haven't required a password reset, please ignore this email."
+  email_recover_password_body: "By clicking on this link, you can set a new Hedy password. If you haven't required a password reset, please ignore this email."
   email_reset_password_subject: "Your Hedy password has been resetted"
   email_reset_password_body: "Your Hedy password has been resetted to a new one. If you did this, all is good.\nIf you didn't change your password, please contact us immediately by replying to this email."
   # These variables are added here to make the code simpler, but conceptually they belong elsewhere

diff --git a/coursedata/texts/nl.yaml b/coursedata/texts/nl.yaml
@@ -82,29 +82,29 @@ Auth:
   exists_username: "Die gebruikersnaam is al in gebruik."
   email_hello: "Hoi!"
   email_goodbye: "Dankjewel!\nGroetjes van Het Hedy team"
-  email_welcome_verify_subject: "Je Hedy account is aangemaakt"
-  email_welcome_verify_body: "Je Hedy account is aangemaakt. Welkom!\nKlik op deze link om je email adres te bevestigen:"
+  email_welcome_verify_subject: "Welkom bij Hedy"
+  email_welcome_verify_body: "Je Hedy account is aangemaakt. Welkom!\nKlik op deze link om je email adres te bevestigen: "
   email_change_password_subject: "Je Hedy wachtwoord is veranderd"
   email_change_password_body: "Je Hedy wachtwoord is veranderd. Heb jij dat zelf aangevraagd? Dan is alles in orde.\nHeb jij dat niet gedaan? Dan kan het zijn dat iemand probeert jouw Hedy account over te nemen. Reageer op deze mail zodat we kunnen controleren of alles in orde is."
   email_recover_password_subject: "Verander je Hedy wachtwoord"
-  email_recover_password_body: "Als je op deze link klikt, kun je een nieuw Hedy wachtwoord instellen."
+  email_recover_password_body: "Als je op deze link klikt, kun je een nieuw Hedy wachtwoord instellen:"
   email_reset_password_subject: "Je Hedy wachtwoord is veranderd"
   email_reset_password_body: "Je Hedy wachtwoord is veranderd in een nieuw wachtwoord. eb jij dat zelf aangevraagd? Dan is alles in orde.\nHeb jij dat niet gedaan? Dan kan het zijn dat iemand probeert jouw Hedy account over te nemen. Reageer op deze mail zodat we kunnen controleren of alles in orde is."
   # These variables are added here to make the code simpler, but conceptually they belong elsewhere
-  program_header: "My programs"
+  program_header: "Mijn programma's"
   save_prompt: "Je moet een account aanmaken om je programma op te slaan. Wil je dat nu doen?"
   save_success: "Gelukt!"
   save_success_detail: "Je programma is opgeslagen"
 Programs:
-  recent: "My recent programs"
+  recent: "Mijn programma's"
   level: "Level"
-  minutes: "minutes"
-  hours: "hours"
-  days:  "days"
+  minutes: "minuten"
+  hours: "uuren"
+  days:  "dagen"
   ago-1: ""
-  ago-2: "ago"
+  ago-2: "geleden"
   open: "Open"
-  delete: "Delete"
-  delete_confirm: "Are you sure you want to delete the program?"
-  no_programs: "You have no programs yet."
-  write_first: "Write your first program!"
+  delete: "Verwijderen"
+  delete_confirm: "Weet u zeker dat je het programma wil verwijderen?"
+  no_programs: "Nog geen programma's."
+  write_first: "Schrijf je eerste programma!"
diff --git a/coursedata/texts/pt_br.yaml b/coursedata/texts/pt_br.yaml
@@ -82,12 +82,12 @@ Auth:
   exists_username: "That username is already in use."
   email_hello: "Hi!"
   email_goodbye: "Thank you!\nThe Hedy team"
-  email_welcome_verify_subject: "Your Hedy account has been created"
-  email_welcome_verify_body: "Your Hedy account has been created successfully. Welcome!\nPlease click on the link below to verify your email address."
+  email_welcome_verify_subject: "Welcome to Hedy"
+  email_welcome_verify_body: "Your Hedy account has been created successfully. Welcome!\nPlease click on this link to verify your email address:"
   email_change_password_subject: "Your Hedy password has been changed"
   email_change_password_body: "Your Hedy password has been changed. If you did this, all is good.\nIf you didn't change your password, please contact us immediately by replying to this email."
   email_recover_password_subject: "Reset your Hedy password"
-  email_recover_password_body: "By clicking the link below, you can set a new Hedy password. If you haven't required a password reset, please ignore this email."
+  email_recover_password_body: "By clicking on this link, you can set a new Hedy password. If you haven't required a password reset, please ignore this email."
   email_reset_password_subject: "Your Hedy password has been resetted"
   email_reset_password_body: "Your Hedy password has been resetted to a new one. If you did this, all is good.\nIf you didn't change your password, please contact us immediately by replying to this email."
   # These variables are added here to make the code simpler, but conceptually they belong elsewhere