From 43fd765a3407c84bc3ea53afd70d664cedb22f0a Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 11:17:14 +0100 Subject: [PATCH] Title on profile update page --- apps/member/views.py | 1 + locale/de/LC_MESSAGES/django.po | 14 +++++++------- locale/fr/LC_MESSAGES/django.po | 22 ++++++++++++---------- templates/member/profile_update.html | 23 +++++++++++------------ 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index 366523b0..fab68b01 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -60,6 +60,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): context['user'] = self.request.user context["profile_form"] = self.second_form( instance=context['user_modified'].profile) + context['title'] = _("Update Profile") return context diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index cc63b25a..296375b2 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-21 10:36+0100\n" +"POT-Creation-Date: 2020-02-21 11:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -180,7 +180,11 @@ msgstr "" msgid "memberships" msgstr "" -#: apps/member/views.py:78 apps/note/models/notes.py:229 +#: apps/member/views.py:63 templates/member/profile_detail.html:29 +msgid "Update Profile" +msgstr "" + +#: apps/member/views.py:79 apps/note/models/notes.py:229 msgid "An alias with a similar name already exists." msgstr "" @@ -361,7 +365,7 @@ msgstr "" msgid "French" msgstr "" -#: templates/base.html:14 +#: templates/base.html:13 msgid "The ENS Paris-Saclay BDE note." msgstr "" @@ -405,10 +409,6 @@ msgstr "" msgid "Manage auth token" msgstr "" -#: templates/member/profile_detail.html:29 -msgid "Update Profile" -msgstr "" - #: templates/member/profile_detail.html:30 msgid "Change password" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 04efe8d9..b78eb5fd 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/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: 2020-02-21 10:36+0100\n" +"POT-Creation-Date: 2020-02-21 11:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -127,7 +127,9 @@ msgstr "début de l'adhésion" #: apps/member/models.py:81 msgid "How long after January 1st the members can renew their membership." -msgstr "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur adhésion." +msgstr "" +"Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " +"adhésion." #: apps/member/models.py:86 msgid "membership end" @@ -138,8 +140,8 @@ msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -"Combien de temps l'adhésion peut durer après le 1er Janvier de l'année suivante " -"avant que les adhérents peuvent renouveler leur adhésion." +"Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " +"suivante avant que les adhérents peuvent renouveler leur adhésion." #: apps/member/models.py:93 apps/note/models/notes.py:127 msgid "club" @@ -177,7 +179,11 @@ msgstr "adhésion" msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:78 apps/note/models/notes.py:229 +#: apps/member/views.py:63 templates/member/profile_detail.html:29 +msgid "Update Profile" +msgstr "Modifier le profil" + +#: apps/member/views.py:79 apps/note/models/notes.py:229 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." @@ -359,7 +365,7 @@ msgstr "" msgid "French" msgstr "" -#: templates/base.html:14 +#: templates/base.html:13 msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." @@ -403,10 +409,6 @@ msgstr "nom d'utilisateur" msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: templates/member/profile_detail.html:29 -msgid "Update Profile" -msgstr "Modifier le profil" - #: templates/member/profile_detail.html:30 msgid "Change password" msgstr "Changer le mot de passe" diff --git a/templates/member/profile_update.html b/templates/member/profile_update.html index 10936cf7..a47a147b 100644 --- a/templates/member/profile_update.html +++ b/templates/member/profile_update.html @@ -1,17 +1,16 @@ - {% extends "base.html" %} -{% load crispy_forms_tags %} -{% load i18n static pretty_money django_tables2 %} +{% load i18n crispy_forms_tags %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% block content %} -
- {% csrf_token %} - {{ form|crispy }} - {{ profile_form|crispy }} - -
- + {% csrf_token %} + {{ form|crispy }} + {{ profile_form|crispy }} + + {% endblock %}