From f61d09b65eb2e950c46c5897111688a55133f373 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 10 Aug 2019 15:58:13 +0200 Subject: [PATCH] Update locales --- media/locale/fr/LC_MESSAGES/django.po | 16 ++++++---- media/templates/media/media.html | 40 ----------------------- media/views.py | 7 ---- theme/locale/fr/LC_MESSAGES/django.po | 2 +- users/locale/fr/LC_MESSAGES/django.po | 46 +++++++++++++-------------- 5 files changed, 34 insertions(+), 77 deletions(-) delete mode 100644 media/templates/media/media.html diff --git a/media/locale/fr/LC_MESSAGES/django.po b/media/locale/fr/LC_MESSAGES/django.po index 3915b8f..0bd4731 100644 --- a/media/locale/fr/LC_MESSAGES/django.po +++ b/media/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-10 10:24+0200\n" +"POT-Creation-Date: 2019-08-10 15:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,6 +13,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: admin.py:47 +msgid "Turn back" +msgstr "Rendre" + +#: admin.py:50 +msgid "permanencier rendu" +msgstr "" + #: models.py:17 msgid "author" msgstr "auteur" @@ -45,10 +53,6 @@ msgstr "jeu" msgid "games" msgstr "jeux" -#: templates/media/media.html:37 -msgid "Save" -msgstr "Enregistrer" - -#: views.py:80 +#: views.py:41 msgid "Welcome to the Mediatek database" msgstr "Bienvenue sur la base de données de la Mediatek" diff --git a/media/templates/media/media.html b/media/templates/media/media.html deleted file mode 100644 index 5542ff1..0000000 --- a/media/templates/media/media.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "base_form.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} - -{% load i18n %} - -{% block content %} -
{% csrf_token %} - {% if form.non_field_errors %} -

- {% for error in form.non_field_errors %} - {{ error }} - {% endfor %} -

- {% endif %} -
- {% for field in form %} -
- {{ field.errors }} -
- {{ field.label_tag }} - {% if field.is_readonly %} -
{{ field.contents }}
- {% else %} - {{ field }} - {% endif %} - {% if field.field.help_text %} -
{{ field.field.help_text|safe }}
- {% endif %} -
-
- {% endfor %} -
- -
- -
-
-{% endblock %} diff --git a/media/views.py b/media/views.py index a225a17..fb420c2 100644 --- a/media/views.py +++ b/media/views.py @@ -6,7 +6,6 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required, permission_required from django.db import transaction from django.shortcuts import redirect, render -from django.template.context_processors import csrf from django.utils import timezone from django.utils.translation import gettext_lazy as _ from reversion import revisions as reversion @@ -14,12 +13,6 @@ from reversion import revisions as reversion from .models import Emprunt -def form(ctx, template, request): - c = ctx - c.update(csrf(request)) - return render(request, template, c) - - @login_required @permission_required('media.change_emprunt') def retour_emprunt(request, empruntid): diff --git a/theme/locale/fr/LC_MESSAGES/django.po b/theme/locale/fr/LC_MESSAGES/django.po index 190321d..a69bc2c 100644 --- a/theme/locale/fr/LC_MESSAGES/django.po +++ b/theme/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-10 10:24+0200\n" +"POT-Creation-Date: 2019-08-10 15:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/users/locale/fr/LC_MESSAGES/django.po b/users/locale/fr/LC_MESSAGES/django.po index 07b9e91..d5a390f 100644 --- a/users/locale/fr/LC_MESSAGES/django.po +++ b/users/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-10 10:21+0200\n" +"POT-Creation-Date: 2019-08-10 15:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,74 +13,74 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: admin.py:29 +#: admin.py:32 msgid "adherent status" msgstr "statut adhérent" -#: admin.py:34 +#: admin.py:37 msgid "Yes" msgstr "" -#: admin.py:51 +#: admin.py:54 msgid "Personal info" msgstr "" -#: admin.py:53 +#: admin.py:56 msgid "Permissions" msgstr "" -#: admin.py:56 +#: admin.py:59 msgid "Important dates" msgstr "" -#: admin.py:86 +#: admin.py:89 msgid "An email to set the password was sent." msgstr "Un mail pour initialiser le mot de passe a été envoyé." -#: admin.py:89 +#: admin.py:92 msgid "The email is invalid." msgstr "L'adresse mail est invalide." -#: admin.py:108 +#: admin.py:111 msgid "Adhere" msgstr "Adhérer" -#: admin.py:111 +#: admin.py:114 msgid "is adherent" msgstr "statut adhérent" -#: admin.py:119 -msgid "Register borrowed item" -msgstr "Enregistrer emprunt" +#: apps.py:15 +msgid "users" +msgstr "" -#: admin.py:122 -msgid "actions" -msgstr "actions" - -#: models.py:14 +#: models.py:15 msgid "phone number" msgstr "numéro de téléphone" -#: models.py:20 +#: models.py:21 msgid "address" msgstr "adresse" -#: models.py:26 +#: models.py:27 msgid "maximum borrowed" msgstr "emprunts maximal" -#: models.py:27 +#: models.py:28 msgid "Maximal amount of simultaneous borrowed item authorized." msgstr "Nombre maximal d'objets empruntés en même temps." -#: models.py:32 +#: models.py:33 msgid "comment" msgstr "commentaire" -#: models.py:33 +#: models.py:34 msgid "Promotion..." msgstr "" +#: models.py:39 +msgid "date joined" +msgstr "" + #: templates/users/user.html:40 msgid "Change password" msgstr ""