Merge pull request #76 from sitn/translate_emails

Fix multiline "trans" and finish template translations
camptocamp · Dec 12, 2024 · 4bb524d · 4bb524d
2 parents 245de75 + 6765b1b
commit 4bb524d
Show file tree

Hide file tree

Showing 9 changed files with 981 additions and 943 deletions.
diff --git a/api/locale/fr/LC_MESSAGES/django.po b/api/locale/fr/LC_MESSAGES/django.po
diff --git a/api/templates/email_admin.html b/api/templates/email_admin.html
@@ -24,6 +24,6 @@
 {% endblock %}
 {% block footer %}
         <p>
-        {% trans "Cet email vous a été envoyé car vous êtes administrateur du Geoshop." %}
+        {% trans "This email was sent to you because you are an administrator of the Geoshop." %}
         </p>
 {% endblock %}
diff --git a/api/templates/email_download_ready.html b/api/templates/email_download_ready.html
@@ -1,16 +1,15 @@
 {% extends "email_base_template.html" %}
 {% load i18n %}
 {% block content %}
-<p>{% blocktrans %} L'extraction pour la commande n°{{ order_id }} a été réalisée. {% endblocktrans %}</p>
-<p>
-        {% blocktrans %} Connectez-vous sur le géoshop et téléchargez les produits commandés dans la section "Mes commandes"
-        ou en cliquant directement sur ce lien: {% endblocktrans %}<br>
-        <a style="color:#26A59A" href="{{ front_url }}/welcome/download/{{ download_guid }}">
-                {{ front_url }}/welcome/download/{{ download_guid }}
-        </a>
+<p>{% blocktrans %}The extraction for order n°{{ order_id }} has been completed. {% endblocktrans %}</p>
+<p>{% blocktrans %}Log in to the Geoshop and download the ordered products from the "My Orders" section
+or by clicking directly on this link: {% endblocktrans %}<br>
+<a style="color:#26A59A" href="{{ front_url }}/welcome/download/{{ download_guid }}">
+{{ front_url }}/welcome/download/{{ download_guid }}
+</a>
 </p>
 <p>
-        {% trans "Veuillez prendre note que les liens de téléchargement ne sont disponibles que pendant 1 mois." %}
+        {% trans "Please note that the download links are only available for 1 month." %}
 </p>
 {% endblock %}
 {% block footer %}

diff --git a/api/templates/email_quote_done.html b/api/templates/email_quote_done.html
@@ -1,8 +1,8 @@
 {% extends "email_base_template.html" %}
 {% load i18n %}
 {% block content %}
-        <p>{% blocktrans %}Le devis pour la commande n°{{ order_id }} a été réalisé.{% endblocktrans %}</p>
-        <p>{% trans "Connectez-vous sur le géoshop et confirmez ou annulez votre commande dans la section \"Mes commandes\"." %}</p>
+        <p>{% blocktrans %}The quote for order n°{{ order_id }} has been completed.{% endblocktrans %}</p>
+        <p>{% blocktrans %}Log in to the Geoshop and confirm or cancel your order in the "My Orders" section."{% endblocktrans %}</p>
 {% endblock %}
 {% block footer %}
 {% endblock %}
diff --git a/api/templates/email_user_change.html b/api/templates/email_user_change.html
@@ -1,10 +1,10 @@
 {% extends "email_base_template.html" %}
 {% load i18n %}
 {% block content %}{% blocktrans %}
-        <p>Vos demandes de modification de profil ont été envoyées aux administrateurs du Geoshop.</p>
+        <p>Your profile update requests have been sent to the Geoshop administrators.</p>
         <p>
-          Elles seront analysées et reportées dans les jours à venir.
-          Vous serez averti par email une fois les modifications effectuées.
+          They will be reviewed and implemented in the coming days.  
+          You will be notified by email once the updates are completed.  
         </p>
 {% endblocktrans %}{% endblock %}
 {% block footer %}

diff --git a/api/templates/email_user_footer.html b/api/templates/email_user_footer.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% block footer %}
         <p>
-          {% trans "Cet email est adressé à" %} {{ first_name }} {{ last_name }}.
+          {% trans "This email was sent to" %} {{ first_name }} {{ last_name }}.
         </p>
 {% endblock %}
diff --git a/api/templates/email_validation_needed.html b/api/templates/email_validation_needed.html
@@ -3,14 +3,14 @@
 {% block content %}
 <!-- TODO template needs translation -->
 <p>
-  {% trans "Votre accord est nécessaire en vue de traiter une commande du géoshop. Cliquez sur ce lien pour valider ou refuser la commande:" %}<br>
+  {% trans "Your approval is required to process an order from the Geoshop. Click on this link to approve or reject the order:" %}<br>
   <a style="color:#26A59A" href="{{ front_url }}/welcome/validate/{{ what }}/{{ token }}">
     {{ front_url }}/welcome/validate/{{ what }}/{{ token }}
   </a>
 </p>
 <p>
-    {% trans "Veuillez noter que le client ne recevra pas les données tant qu'une action de votre part n'est pas entreprise.
-    Si vous estimez que cet email est une erreur, veuillez s'il vous plaît prendre contact avec le" %}
+    {% trans "Please note that the client will not receive the data until you take action." %}
+    {% trans "If you believe this email was sent to you in error, please contact " %}
   <a href="mailto:{{ REPLY_TO_EMAIL }}">{{ REPLY_TO_EMAIL }}</a>.
 </p>
 {% endblock %}

diff --git a/api/templates/email_welcome_user.html b/api/templates/email_welcome_user.html
@@ -1,8 +1,8 @@
 {% extends "email_base_template.html" %}
 {% load i18n %}
 {% block content %}
-        <p>{% trans "Votre demande de création de compte est en cours de vérification." %}</p>
-        <p>{% trans "Vous recevrez un email lorsque votre inscription sera validée." %}</p>
+        <p>{% trans "Your account creation request is under review." %}</p>
+        <p>{% trans "You will receive an email when your registration is approved." %}</p>
 {% endblock %}
 {% block footer %}
         {% include "email_user_footer.html"%}

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
@@ -1,47 +1,47 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-24 17:06+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: default_settings.py:123 settings.py:122
-msgid "German"
-msgstr "Allemand"
-
-#: default_settings.py:124 settings.py:123
-msgid "Italian"
-msgstr "Italien"
-
-#: default_settings.py:125 settings.py:124
-msgid "French"
-msgstr "Français"
-
-#: default_settings.py:126 settings.py:125
-msgid "English"
-msgstr "Anglais"
-
-#: default_settings.py:127 settings.py:126
-msgid "Romansh"
-msgstr "Romanche"
-
-#: urls.py:18
-msgid "GeoShop Administration"
-msgstr "Administration du GeoShop"
-
-#: urls.py:19
-msgid "GeoShop Admin"
-msgstr "Administration du GeoShop"
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-12-11 11:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: .\default_settings.py:131 .\settings.py:126
+msgid "German"
+msgstr "Allemand"
+
+#: .\default_settings.py:132 .\settings.py:127
+msgid "Italian"
+msgstr "Italien"
+
+#: .\default_settings.py:133 .\settings.py:128
+msgid "French"
+msgstr "Français"
+
+#: .\default_settings.py:134 .\settings.py:129
+msgid "English"
+msgstr "Anglais"
+
+#: .\default_settings.py:135 .\settings.py:130
+msgid "Romansh"
+msgstr "Romanche"
+
+#: .\urls.py:32
+msgid "GeoShop Administration"
+msgstr "Administration du GeoShop"
+
+#: .\urls.py:33
+msgid "GeoShop Admin"
+msgstr "Administration du GeoShop"