From b2b1f03b46335cde4e2773c285d466c4b9395a80 Mon Sep 17 00:00:00 2001 From: quark Date: Tue, 6 Aug 2024 15:20:22 +0200 Subject: [PATCH] Edit food HTML template for translation, translations. Now the mandatory allergens are automatically created --- .../0003_create_14_allergens_mandatory.py | 62 ++++ .../food/templates/food/basicfood_detail.html | 12 +- apps/food/templates/food/qrcode_detail.html | 28 +- .../food/transformedfood_detail.html | 46 +-- .../templates/food/transformedfood_list.html | 26 +- locale/de/LC_MESSAGES/django.po | 279 +++++++++++++++- locale/es/LC_MESSAGES/django.po | 304 +++++++++++++++++- locale/fr/LC_MESSAGES/django.po | 290 ++++++++++++++++- 8 files changed, 964 insertions(+), 83 deletions(-) create mode 100644 apps/food/migrations/0003_create_14_allergens_mandatory.py diff --git a/apps/food/migrations/0003_create_14_allergens_mandatory.py b/apps/food/migrations/0003_create_14_allergens_mandatory.py new file mode 100644 index 00000000..236eaea4 --- /dev/null +++ b/apps/food/migrations/0003_create_14_allergens_mandatory.py @@ -0,0 +1,62 @@ +from django.db import migrations + +def create_14_mandatory_allergens(apps, schema_editor): + """ + There are 14 mandatory allergens, they are pre-injected + """ + + Allergen = apps.get_model("food", "allergen") + + Allergen.objects.get_or_create( + name="Gluten", + ) + Allergen.objects.get_or_create( + name="Fruits à coques", + ) + Allergen.objects.get_or_create( + name="Crustacés", + ) + Allergen.objects.get_or_create( + name="Céléri", + ) + Allergen.objects.get_or_create( + name="Oeufs", + ) + Allergen.objects.get_or_create( + name="Moutarde", + ) + Allergen.objects.get_or_create( + name="Poissons", + ) + Allergen.objects.get_or_create( + name="Soja", + ) + Allergen.objects.get_or_create( + name="Lait", + ) + Allergen.objects.get_or_create( + name="Sulfites", + ) + Allergen.objects.get_or_create( + name="Sésame", + ) + Allergen.objects.get_or_create( + name="Lupin", + ) + Allergen.objects.get_or_create( + name="Arachides", + ) + Allergen.objects.get_or_create( + name="Mollusques", + ) + +class Migration(migrations.Migration): + dependencies = [ + ('food', '0002_transformedfood_shelf_life'), + ] + + operations = [ + migrations.RunPython(create_14_mandatory_allergens), + ] + + diff --git a/apps/food/templates/food/basicfood_detail.html b/apps/food/templates/food/basicfood_detail.html index 8daefaf8..b890a93d 100644 --- a/apps/food/templates/food/basicfood_detail.html +++ b/apps/food/templates/food/basicfood_detail.html @@ -11,17 +11,17 @@ SPDX-License-Identifier: GPL-3.0-or-later {{ title }}
-

name : {{ food.name }}

-

owner : {{ food.owner }}

-

arrival_date : {{ food.arrival_date }}

-

expiry_date : {{ food.expiry_date }}

-

allergens :

+

{% trans 'Name' %} : {{ food.name }}

+

{% trans 'Owner' %} : {{ food.owner }}

+

{% trans 'Arrival date' %} : {{ food.arrival_date }}

+

{% trans 'Expiry date' %} : {{ food.expiry_date }}

+

{% trans 'Allergens' %} :

- Update + {% trans 'Update' %}
{% endblock %} diff --git a/apps/food/templates/food/qrcode_detail.html b/apps/food/templates/food/qrcode_detail.html index c74dd0e3..def3a028 100644 --- a/apps/food/templates/food/qrcode_detail.html +++ b/apps/food/templates/food/qrcode_detail.html @@ -6,19 +6,19 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %}
-

- HTML not finished
- {{ title }} -

-
-

qrcode : {{ qrcode.qr_code_number }}

-

name : {{ qrcode.food_container.name }}

- {% if qrcode.food_container.polymorphic_ctype.name == 'Basic food' %} - Update - {% else %} - Update - {% endif %} - Add the ingrdient -
+

+ HTML not finished
+ {{ title }} +

+
+

{% trans 'QR-code' %} : {{ qrcode.qr_code_number }}

+

{% trans 'Name' %} : {{ qrcode.food_container.name }}

+ {% if qrcode.food_container.polymorphic_ctype.name == 'Basic food' %} + {% trans 'Update' %} + {% else %} + {% trans 'Update' %} + {% endif %} + {% trans 'Add the ingredient' %} +
{% endblock %} diff --git a/apps/food/templates/food/transformedfood_detail.html b/apps/food/templates/food/transformedfood_detail.html index 2ac87989..5ffb2cc0 100644 --- a/apps/food/templates/food/transformedfood_detail.html +++ b/apps/food/templates/food/transformedfood_detail.html @@ -6,28 +6,28 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %}
-

- HTML not finished
- {{ title }} -

-
-

name : {{ food.name }}

-

owner : {{ food.owner }}

-

creation_date : {{ food.creation_date }}

-

expiry_date : {{ food.expiry_date }}

-

allergens :

-
    - {% for allergen in food.allergens.iterator %} -
  • {{ allergen.name }}
    • - {% endfor %} -
-

ingredients :

- - Update -
+

+ HTML not finished
+ {{ title }} +

+
+

{% trans 'Name' %} : {{ food.name }}

+

{% trans 'Owner' %} : {{ food.owner }}

+

{% trans 'Creation date' %} : {{ food.creation_date }}

+

{% trans 'Expiry date' %} : {{ food.expiry_date }}

+

{% trans 'Allergens' %} :

+
    + {% for allergen in food.allergens.iterator %} +
  • {{ allergen.name }}
    • + {% endfor %} +
+

{% trans 'Ingredients' %} :

+ + {% trans 'Update' %} +
{% endblock %} diff --git a/apps/food/templates/food/transformedfood_list.html b/apps/food/templates/food/transformedfood_list.html index 98d89aa4..2c4cb93d 100644 --- a/apps/food/templates/food/transformedfood_list.html +++ b/apps/food/templates/food/transformedfood_list.html @@ -7,18 +7,18 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %}
-
- - New transformed food - -
-

- In preparation -

- {% render_table table %} -

- Open -

- {% render_table open_table %} +
+ + {% trans 'New meal' %} + +
+

+ {% trans 'In preparation' %} +

+ {% render_table table %} +

+ {% trans 'Free' %} +

+ {% render_table open_table %}
{% endblock %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 538aff43..91be9609 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-06 13:39+0200\n" +"POT-Creation-Date: 2024-08-06 14:46+0200\n" "PO-Revision-Date: 2020-11-16 20:02+0000\n" "Last-Translator: bleizi \n" "Language-Team: German \n" @@ -467,7 +467,7 @@ msgstr "Telefonnummer" msgid "food container" msgstr "" -#: apps/food/models.py:30 +#: apps/food/models.py:30 apps/food/templates/food/qrcode_detail.html:14 msgid "QR-code" msgstr "" @@ -484,7 +484,8 @@ msgstr "" msgid "Allergen" msgstr "" -#: apps/food/models.py:48 +#: apps/food/models.py:48 apps/food/templates/food/basicfood_detail.html:18 +#: apps/food/templates/food/transformedfood_detail.html:18 msgid "Allergens" msgstr "" @@ -558,10 +559,73 @@ msgstr "Geld überweisen" msgid "Transformed foods" msgstr "" -#: apps/food/views.py:25 +#: apps/food/templates/food/basicfood_detail.html:14 +#: apps/food/templates/food/qrcode_detail.html:15 +#: apps/food/templates/food/transformedfood_detail.html:14 +#: apps/note/templates/note/transaction_form.html:132 +#: apps/treasury/models.py:60 +msgid "Name" +msgstr "Name" + +#: apps/food/templates/food/basicfood_detail.html:15 +#: apps/food/templates/food/transformedfood_detail.html:15 +#, fuzzy +#| msgid "Owned" +msgid "Owner" +msgstr "Besetzt" + +#: apps/food/templates/food/basicfood_detail.html:16 +#, fuzzy +#| msgid "start date" +msgid "Arrival date" +msgstr "Anfangsdatum" + +#: apps/food/templates/food/basicfood_detail.html:17 +#: apps/food/templates/food/transformedfood_detail.html:17 +#, fuzzy +#| msgid "birth date" +msgid "Expiry date" +msgstr "Geburtsdatum" + +#: apps/food/templates/food/basicfood_detail.html:24 +#: apps/food/templates/food/qrcode_detail.html:17 +#: apps/food/templates/food/qrcode_detail.html:19 +#: apps/food/templates/food/transformedfood_detail.html:30 +#, fuzzy +#| msgid "Update bus" +msgid "Update" +msgstr "Bus bearbeiten" + +#: apps/food/templates/food/qrcode_detail.html:21 apps/food/views.py:25 msgid "Add the ingredient" msgstr "" +#: apps/food/templates/food/transformedfood_detail.html:16 +#, fuzzy +#| msgid "created at" +msgid "Creation date" +msgstr "erschafft am" + +#: apps/food/templates/food/transformedfood_detail.html:24 +msgid "Ingredients" +msgstr "" + +#: apps/food/templates/food/transformedfood_list.html:12 +#, fuzzy +#| msgid "New user" +msgid "New meal" +msgstr "Neue User" + +#: apps/food/templates/food/transformedfood_list.html:16 +#, fuzzy +#| msgid "WEI registration" +msgid "In preparation" +msgstr "WEI Registrierung" + +#: apps/food/templates/food/transformedfood_list.html:20 +msgid "Free" +msgstr "" + #: apps/food/views.py:39 msgid "The product isn't ready" msgstr "" @@ -1904,11 +1968,6 @@ msgstr "Aktion" msgid "Amount" msgstr "Anzahl" -#: apps/note/templates/note/transaction_form.html:132 -#: apps/treasury/models.py:60 -msgid "Name" -msgstr "Name" - #: apps/note/templates/note/transaction_form.html:177 msgid "Select emitter" msgstr "Sender auswählen" @@ -3848,6 +3907,208 @@ msgstr "" "müssen Ihre E-Mail-Adresse auch überprüfen, indem Sie dem Link folgen, den " "Sie erhalten haben." +#, fuzzy +#~| msgid "Transfer money" +#~ msgid "New transformed food" +#~ msgstr "Geld überweisen" + +#, fuzzy +#~| msgid "Invitation" +#~ msgid "Syndication" +#~ msgstr "Einladung" + +#, fuzzy +#~| msgid "There is no results." +#~ msgid "That page contains no results" +#~ msgstr "Es gibt keine Ergebnisse." + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Enter a number." +#~ msgstr "Telefonnummer" + +#, fuzzy +#~| msgid "add" +#~ msgid "and" +#~ msgstr "hinzufügen" + +#, fuzzy, python-format +#~| msgid "A template with this name already exist" +#~ msgid "%(model_name)s with this %(field_labels)s already exists." +#~ msgstr "Eine Vorlage mit diesem Namen ist bereits vorhanden" + +#, fuzzy +#~| msgid "This image cannot be loaded." +#~ msgid "This field cannot be null." +#~ msgstr "Dieses Bild kann nicht geladen werden." + +#, fuzzy +#~| msgid "This image cannot be loaded." +#~ msgid "This field cannot be blank." +#~ msgstr "Dieses Bild kann nicht geladen werden." + +#, fuzzy, python-format +#~| msgid "A template with this name already exist" +#~ msgid "%(model_name)s with this %(field_label)s already exists." +#~ msgstr "Eine Vorlage mit diesem Namen ist bereits vorhanden" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Decimal number" +#~ msgstr "Telefonnummer" + +#, fuzzy +#~| msgid "action" +#~ msgid "Duration" +#~ msgstr "Aktion" + +#, fuzzy +#~| msgid "address" +#~ msgid "Email address" +#~ msgstr "Adresse" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Floating point number" +#~ msgstr "Telefonnummer" + +#, fuzzy +#~| msgid "IP Address" +#~ msgid "IPv4 address" +#~ msgstr "IP Adresse" + +#, fuzzy +#~| msgid "IP Address" +#~ msgid "IP address" +#~ msgstr "IP Adresse" + +#, fuzzy +#~| msgid "Invoice identifier" +#~ msgid "Universally unique identifier" +#~ msgstr "Rechnungskennung" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Enter a whole number." +#~ msgstr "Telefonnummer" + +#, fuzzy +#~| msgid "Email validation" +#~ msgid "Enter a valid duration." +#~ msgstr "Email validierung" + +#, fuzzy +#~| msgid "Current activity" +#~ msgid "Currently" +#~ msgstr "Aktuelle Veranstaltung" + +#, fuzzy +#~| msgid "change" +#~ msgid "Change" +#~ msgstr "bearbeiten" + +#, fuzzy +#~| msgid "Search WEI" +#~ msgid "March" +#~ msgstr "WEI finden" + +#, fuzzy +#~| msgid "member" +#~ msgid "September" +#~ msgstr "Mitglied" + +#, fuzzy +#~| msgid "member" +#~ msgid "November" +#~ msgstr "Mitglied" + +#, fuzzy +#~| msgid "member" +#~ msgid "December" +#~ msgstr "Mitglied" + +#, fuzzy +#~| msgid "fee" +#~ msgid "feb" +#~ msgstr "Preis" + +#, fuzzy +#~| msgid "product" +#~ msgid "oct" +#~ msgstr "Produkt" + +#, fuzzy +#~| msgid "Search WEI" +#~ msgctxt "abbrev. month" +#~ msgid "March" +#~ msgstr "WEI finden" + +#, fuzzy +#~| msgid "Search WEI" +#~ msgctxt "alt. month" +#~ msgid "March" +#~ msgstr "WEI finden" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "September" +#~ msgstr "Mitglied" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "November" +#~ msgstr "Mitglied" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "December" +#~ msgstr "Mitglied" + +#, fuzzy +#~| msgid "This activity is not validated yet." +#~ msgid "This is not a valid IPv6 address." +#~ msgstr "Diese Veranstaltung ist noch nicht bestätigt." + +#, fuzzy, python-format +#~| msgid "year" +#~ msgid "%d year" +#~ msgid_plural "%d years" +#~ msgstr[0] "Jahr" +#~ msgstr[1] "Jahr" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No year specified" +#~ msgstr "Kein Grund gegeben" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No month specified" +#~ msgstr "Kein Grund gegeben" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No day specified" +#~ msgstr "Kein Grund gegeben" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No week specified" +#~ msgstr "Kein Grund gegeben" + +#, fuzzy +#~| msgid "Reset my password" +#~ msgid "Resource owner password-based" +#~ msgstr "Mein Passwort zurücksetzen" + +#, fuzzy +#~| msgid "This address must be valid." +#~ msgid "The access token is invalid." +#~ msgstr "Diese Adresse muss gültig sein." + #~ msgid "Join BDA Club" #~ msgstr "BDA Mitglieder werden" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index ec3baf3b..a6b18b6e 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-06 13:39+0200\n" +"POT-Creation-Date: 2024-08-06 14:46+0200\n" "PO-Revision-Date: 2022-04-11 23:12+0200\n" "Last-Translator: bleizi \n" "Language-Team: \n" @@ -464,7 +464,7 @@ msgstr "número de teléfono" msgid "food container" msgstr "" -#: apps/food/models.py:30 +#: apps/food/models.py:30 apps/food/templates/food/qrcode_detail.html:14 msgid "QR-code" msgstr "" @@ -481,7 +481,8 @@ msgstr "" msgid "Allergen" msgstr "" -#: apps/food/models.py:48 +#: apps/food/models.py:48 apps/food/templates/food/basicfood_detail.html:18 +#: apps/food/templates/food/transformedfood_detail.html:18 msgid "Allergens" msgstr "" @@ -555,10 +556,73 @@ msgstr "Transferir dinero" msgid "Transformed foods" msgstr "" -#: apps/food/views.py:25 +#: apps/food/templates/food/basicfood_detail.html:14 +#: apps/food/templates/food/qrcode_detail.html:15 +#: apps/food/templates/food/transformedfood_detail.html:14 +#: apps/note/templates/note/transaction_form.html:132 +#: apps/treasury/models.py:60 +msgid "Name" +msgstr "Nombre" + +#: apps/food/templates/food/basicfood_detail.html:15 +#: apps/food/templates/food/transformedfood_detail.html:15 +#, fuzzy +#| msgid "Owned" +msgid "Owner" +msgstr "Tenido" + +#: apps/food/templates/food/basicfood_detail.html:16 +#, fuzzy +#| msgid "invalidate" +msgid "Arrival date" +msgstr "invalidar" + +#: apps/food/templates/food/basicfood_detail.html:17 +#: apps/food/templates/food/transformedfood_detail.html:17 +#, fuzzy +#| msgid "birth date" +msgid "Expiry date" +msgstr "fecha de nacimiento" + +#: apps/food/templates/food/basicfood_detail.html:24 +#: apps/food/templates/food/qrcode_detail.html:17 +#: apps/food/templates/food/qrcode_detail.html:19 +#: apps/food/templates/food/transformedfood_detail.html:30 +#, fuzzy +#| msgid "Update bus" +msgid "Update" +msgstr "Modificar el bus" + +#: apps/food/templates/food/qrcode_detail.html:21 apps/food/views.py:25 msgid "Add the ingredient" msgstr "" +#: apps/food/templates/food/transformedfood_detail.html:16 +#, fuzzy +#| msgid "created at" +msgid "Creation date" +msgstr "creada el" + +#: apps/food/templates/food/transformedfood_detail.html:24 +msgid "Ingredients" +msgstr "" + +#: apps/food/templates/food/transformedfood_list.html:12 +#, fuzzy +#| msgid "New user" +msgid "New meal" +msgstr "Nuevo usuario" + +#: apps/food/templates/food/transformedfood_list.html:16 +#, fuzzy +#| msgid "WEI registration" +msgid "In preparation" +msgstr "Apuntación al WEI" + +#: apps/food/templates/food/transformedfood_list.html:20 +msgid "Free" +msgstr "" + #: apps/food/views.py:39 msgid "The product isn't ready" msgstr "" @@ -1888,11 +1952,6 @@ msgstr "Acción" msgid "Amount" msgstr "Monto" -#: apps/note/templates/note/transaction_form.html:132 -#: apps/treasury/models.py:60 -msgid "Name" -msgstr "Nombre" - #: apps/note/templates/note/transaction_form.html:177 msgid "Select emitter" msgstr "Elegir el remitente" @@ -3772,6 +3831,233 @@ msgstr "" "pagar su afiliación. Tambien tiene que validar su correo electronico con el " "enlace que recibió." +#, fuzzy +#~| msgid "Transfer money" +#~ msgid "New transformed food" +#~ msgstr "Transferir dinero" + +#, fuzzy +#~| msgid "Invitation" +#~ msgid "Syndication" +#~ msgstr "Invitación" + +#, fuzzy +#~| msgid "There is no results." +#~ msgid "That page contains no results" +#~ msgstr "No hay resultado." + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Enter a number." +#~ msgstr "número de teléfono" + +#, fuzzy +#~| msgid "add" +#~ msgid "and" +#~ msgstr "añadir" + +#, fuzzy, python-format +#~| msgid "A template with this name already exist" +#~ msgid "%(model_name)s with this %(field_labels)s already exists." +#~ msgstr "Un plantilla de transacción con un nombre similar ya existe" + +#, fuzzy +#~| msgid "This image cannot be loaded." +#~ msgid "This field cannot be null." +#~ msgstr "Esta imagen no puede ser cargada." + +#, fuzzy +#~| msgid "This image cannot be loaded." +#~ msgid "This field cannot be blank." +#~ msgstr "Esta imagen no puede ser cargada." + +#, fuzzy, python-format +#~| msgid "A template with this name already exist" +#~ msgid "%(model_name)s with this %(field_label)s already exists." +#~ msgstr "Un plantilla de transacción con un nombre similar ya existe" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Decimal number" +#~ msgstr "número de teléfono" + +#, fuzzy +#~| msgid "action" +#~ msgid "Duration" +#~ msgstr "acción" + +#, fuzzy +#~| msgid "address" +#~ msgid "Email address" +#~ msgstr "dirección" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Floating point number" +#~ msgstr "número de teléfono" + +#, fuzzy +#~| msgid "IP Address" +#~ msgid "IPv4 address" +#~ msgstr "Dirección IP" + +#, fuzzy +#~| msgid "IP Address" +#~ msgid "IP address" +#~ msgstr "Dirección IP" + +#, fuzzy +#~| msgid "Invoice identifier" +#~ msgid "Universally unique identifier" +#~ msgstr "Numero de factura" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Enter a whole number." +#~ msgstr "número de teléfono" + +#, fuzzy +#~| msgid "invalidate" +#~ msgid "Enter a valid date." +#~ msgstr "invalidar" + +#, fuzzy +#~| msgid "Email validation" +#~ msgid "Enter a valid duration." +#~ msgstr "Validación del correo electrónico" + +#, fuzzy +#~| msgid "Current activity" +#~ msgid "Currently" +#~ msgstr "Actividad actual" + +#, fuzzy +#~| msgid "change" +#~ msgid "Change" +#~ msgstr "cambiar" + +#, fuzzy +#~| msgid "Search WEI" +#~ msgid "March" +#~ msgstr "Buscar un WEI" + +#, fuzzy +#~| msgid "member" +#~ msgid "September" +#~ msgstr "miembro" + +#, fuzzy +#~| msgid "member" +#~ msgid "November" +#~ msgstr "miembro" + +#, fuzzy +#~| msgid "member" +#~ msgid "December" +#~ msgstr "miembro" + +#, fuzzy +#~| msgid "fee" +#~ msgid "feb" +#~ msgstr "pago" + +#, fuzzy +#~| msgid "product" +#~ msgid "oct" +#~ msgstr "producto" + +#, fuzzy +#~| msgid "Search WEI" +#~ msgctxt "abbrev. month" +#~ msgid "March" +#~ msgstr "Buscar un WEI" + +#, fuzzy +#~| msgid "Search WEI" +#~ msgctxt "alt. month" +#~ msgid "March" +#~ msgstr "Buscar un WEI" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "September" +#~ msgstr "miembro" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "November" +#~ msgstr "miembro" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "December" +#~ msgstr "miembro" + +#, fuzzy +#~| msgid "This activity is not validated yet." +#~ msgid "This is not a valid IPv6 address." +#~ msgstr "Esta actividad no fue validada por ahora." + +#, fuzzy, python-format +#~| msgid "year" +#~ msgid "%d year" +#~ msgid_plural "%d years" +#~ msgstr[0] "año" +#~ msgstr[1] "año" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No year specified" +#~ msgstr "Ningún motivo dado" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No month specified" +#~ msgstr "Ningún motivo dado" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No day specified" +#~ msgstr "Ningún motivo dado" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No week specified" +#~ msgstr "Ningún motivo dado" + +#, fuzzy +#~| msgid "Authorization:" +#~ msgid "Authorization code" +#~ msgstr "Autorizaciones :" + +#, fuzzy +#~| msgid "Reset my password" +#~ msgid "Resource owner password-based" +#~ msgstr "Reiniciar mi contraseña" + +#, fuzzy +#~| msgid "Client secret" +#~ msgid "Client credentials" +#~ msgstr "Secreto cliente" + +#, fuzzy +#~| msgid "This address must be valid." +#~ msgid "The access token is invalid." +#~ msgstr "Este correo tiene que ser valido." + +#, fuzzy +#~| msgid "The user does not have enough money." +#~ msgid "The access token is valid but does not have enough scope." +#~ msgstr "El usuario no tiene suficientemente dinero." + +#, fuzzy +#~| msgid "Application requires following permissions:" +#~ msgid "Application requires following permissions" +#~ msgstr "La aplicación necesita los derechos siguientes :" + #~ msgid "Join BDA Club" #~ msgstr "Afiliarse al club BDA" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f67001ce..9793d6d9 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-06 13:39+0200\n" +"POT-Creation-Date: 2024-08-06 14:46+0200\n" "PO-Revision-Date: 2022-04-11 22:05+0200\n" "Last-Translator: bleizi \n" "Language-Team: French \n" @@ -465,7 +465,7 @@ msgstr "numéro de QR-code" msgid "food container" msgstr "récipient" -#: apps/food/models.py:30 +#: apps/food/models.py:30 apps/food/templates/food/qrcode_detail.html:14 msgid "QR-code" msgstr "QR-code" @@ -482,7 +482,8 @@ msgstr "numéro du QR-code {qr_code_number}" msgid "Allergen" msgstr "Allergène" -#: apps/food/models.py:48 +#: apps/food/models.py:48 apps/food/templates/food/basicfood_detail.html:18 +#: apps/food/templates/food/transformedfood_detail.html:18 msgid "Allergens" msgstr "Allergènes" @@ -546,10 +547,59 @@ msgstr "Bouffe transformée" msgid "Transformed foods" msgstr "Bouffes transformées" -#: apps/food/views.py:25 +#: apps/food/templates/food/basicfood_detail.html:14 +#: apps/food/templates/food/qrcode_detail.html:15 +#: apps/food/templates/food/transformedfood_detail.html:14 +#: apps/note/templates/note/transaction_form.html:132 +#: apps/treasury/models.py:60 +msgid "Name" +msgstr "Nom" + +#: apps/food/templates/food/basicfood_detail.html:15 +#: apps/food/templates/food/transformedfood_detail.html:15 +msgid "Owner" +msgstr "Propriétaire" + +#: apps/food/templates/food/basicfood_detail.html:16 +msgid "Arrival date" +msgstr "Date d'arrivée" + +#: apps/food/templates/food/basicfood_detail.html:17 +#: apps/food/templates/food/transformedfood_detail.html:17 +msgid "Expiry date" +msgstr "Date de péremption" + +#: apps/food/templates/food/basicfood_detail.html:24 +#: apps/food/templates/food/qrcode_detail.html:17 +#: apps/food/templates/food/qrcode_detail.html:19 +#: apps/food/templates/food/transformedfood_detail.html:30 +msgid "Update" +msgstr "Modifier" + +#: apps/food/templates/food/qrcode_detail.html:21 apps/food/views.py:25 msgid "Add the ingredient" msgstr "Ajouter un ingrédient" +#: apps/food/templates/food/transformedfood_detail.html:16 +msgid "Creation date" +msgstr "Date de création" + +#: apps/food/templates/food/transformedfood_detail.html:24 +msgid "Ingredients" +msgstr "Ingrédients" + +#: apps/food/templates/food/transformedfood_list.html:12 +msgid "New meal" +msgstr "Nouveau plat" + +#: apps/food/templates/food/transformedfood_list.html:16 +msgid "In preparation" +msgstr "En cours de préparation" + +#: apps/food/templates/food/transformedfood_list.html:20 +msgid "Free" +msgstr "Open" + #: apps/food/views.py:39 msgid "The product isn't ready" msgstr "Le produit n'est pas prêt" @@ -1873,11 +1923,6 @@ msgstr "Action" msgid "Amount" msgstr "Montant" -#: apps/note/templates/note/transaction_form.html:132 -#: apps/treasury/models.py:60 -msgid "Name" -msgstr "Nom" - #: apps/note/templates/note/transaction_form.html:177 msgid "Select emitter" msgstr "Sélection de l'émetteur·ice" @@ -3778,6 +3823,233 @@ msgstr "" "d'adhésion. Vous devez également valider votre adresse email en suivant le " "lien que vous avez reçu." +#, fuzzy +#~| msgid "Transformed food" +#~ msgid "New transformed food" +#~ msgstr "Bouffe transformée" + +#, fuzzy +#~| msgid "Invitation" +#~ msgid "Syndication" +#~ msgstr "Invitation" + +#, fuzzy +#~| msgid "There is no results." +#~ msgid "That page contains no results" +#~ msgstr "Il n'y a pas de résultat." + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Enter a number." +#~ msgstr "numéro de téléphone" + +#, fuzzy +#~| msgid "add" +#~ msgid "and" +#~ msgstr "ajouter" + +#, fuzzy, python-format +#~| msgid "A template with this name already exist" +#~ msgid "%(model_name)s with this %(field_labels)s already exists." +#~ msgstr "Un modèle de transaction avec un nom similaire existe déjà" + +#, fuzzy +#~| msgid "This image cannot be loaded." +#~ msgid "This field cannot be null." +#~ msgstr "Cette image ne peut pas être chargée." + +#, fuzzy +#~| msgid "This image cannot be loaded." +#~ msgid "This field cannot be blank." +#~ msgstr "Cette image ne peut pas être chargée." + +#, fuzzy, python-format +#~| msgid "A template with this name already exist" +#~ msgid "%(model_name)s with this %(field_label)s already exists." +#~ msgstr "Un modèle de transaction avec un nom similaire existe déjà" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Decimal number" +#~ msgstr "numéro de téléphone" + +#, fuzzy +#~| msgid "action" +#~ msgid "Duration" +#~ msgstr "action" + +#, fuzzy +#~| msgid "address" +#~ msgid "Email address" +#~ msgstr "adresse" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Floating point number" +#~ msgstr "numéro de téléphone" + +#, fuzzy +#~| msgid "IP Address" +#~ msgid "IPv4 address" +#~ msgstr "Adresse IP" + +#, fuzzy +#~| msgid "IP Address" +#~ msgid "IP address" +#~ msgstr "Adresse IP" + +#, fuzzy +#~| msgid "Invoice identifier" +#~ msgid "Universally unique identifier" +#~ msgstr "Numéro de facture" + +#, fuzzy +#~| msgid "phone number" +#~ msgid "Enter a whole number." +#~ msgstr "numéro de téléphone" + +#, fuzzy +#~| msgid "invalidate" +#~ msgid "Enter a valid date." +#~ msgstr "dévalider" + +#, fuzzy +#~| msgid "Email validation" +#~ msgid "Enter a valid duration." +#~ msgstr "Validation de l'adresse mail" + +#, fuzzy +#~| msgid "Current activity" +#~ msgid "Currently" +#~ msgstr "Activité en cours" + +#, fuzzy +#~| msgid "change" +#~ msgid "Change" +#~ msgstr "modifier" + +#, fuzzy +#~| msgid "Search" +#~ msgid "March" +#~ msgstr "Recherche" + +#, fuzzy +#~| msgid "member" +#~ msgid "September" +#~ msgstr "adhérent·e" + +#, fuzzy +#~| msgid "member" +#~ msgid "November" +#~ msgstr "adhérent·e" + +#, fuzzy +#~| msgid "member" +#~ msgid "December" +#~ msgstr "adhérent·e" + +#, fuzzy +#~| msgid "fee" +#~ msgid "feb" +#~ msgstr "cotisation" + +#, fuzzy +#~| msgid "product" +#~ msgid "oct" +#~ msgstr "produit" + +#, fuzzy +#~| msgid "Search" +#~ msgctxt "abbrev. month" +#~ msgid "March" +#~ msgstr "Recherche" + +#, fuzzy +#~| msgid "Search" +#~ msgctxt "alt. month" +#~ msgid "March" +#~ msgstr "Recherche" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "September" +#~ msgstr "adhérent·e" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "November" +#~ msgstr "adhérent·e" + +#, fuzzy +#~| msgid "member" +#~ msgctxt "alt. month" +#~ msgid "December" +#~ msgstr "adhérent·e" + +#, fuzzy +#~| msgid "This activity is not validated yet." +#~ msgid "This is not a valid IPv6 address." +#~ msgstr "Cette activité n'est pas encore validée." + +#, fuzzy, python-format +#~| msgid "year" +#~ msgid "%d year" +#~ msgid_plural "%d years" +#~ msgstr[0] "année" +#~ msgstr[1] "année" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No year specified" +#~ msgstr "Pas de motif spécifié" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No month specified" +#~ msgstr "Pas de motif spécifié" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No day specified" +#~ msgstr "Pas de motif spécifié" + +#, fuzzy +#~| msgid "No reason specified" +#~ msgid "No week specified" +#~ msgstr "Pas de motif spécifié" + +#, fuzzy +#~| msgid "Authorization:" +#~ msgid "Authorization code" +#~ msgstr "Autorisation :" + +#, fuzzy +#~| msgid "Reset my password" +#~ msgid "Resource owner password-based" +#~ msgstr "Réinitialiser mon mot de passe" + +#, fuzzy +#~| msgid "Client secret" +#~ msgid "Client credentials" +#~ msgstr "Secret client" + +#, fuzzy +#~| msgid "This address must be valid." +#~ msgid "The access token is invalid." +#~ msgstr "Cette adresse doit être valide." + +#, fuzzy +#~| msgid "The user does not have enough money." +#~ msgid "The access token is valid but does not have enough scope." +#~ msgstr "L'utilisateur·ice n'a pas assez d'argent." + +#, fuzzy +#~| msgid "Application requires following permissions:" +#~ msgid "Application requires following permissions" +#~ msgstr "L'application requiert les permissions suivantes :" + #, fuzzy #~| msgid "People having you as a friend" #~ msgid "You already have that person as a friend"