From d2ec7f6e0db9ed2f203e92add255da32b55ceab3 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 10:52:07 +0100 Subject: [PATCH 1/9] Do not justify everything --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 12b4cf79..81ebed37 100644 --- a/templates/base.html +++ b/templates/base.html @@ -101,7 +101,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block sidebar %} {% endblock %} -
+
{% block contenttitle %}

{{ title }}

{% endblock %} {% block content %}

Default content...

From 4af37b7990702cf56ed1043073ac1738851b1502 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 10:52:33 +0100 Subject: [PATCH 2/9] Update fr locale --- locale/de/LC_MESSAGES/django.po | 208 ++++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 253 +++++++++++++++++--------------- 2 files changed, 252 insertions(+), 209 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 3b0bb88d..cc63b25a 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-06 21:37+0100\n" +"POT-Creation-Date: 2020-02-21 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,334 +18,346 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: apps/activity/apps.py:11 apps/activity/models.py:77 +#: apps/activity/apps.py:10 apps/activity/models.py:76 msgid "activity" msgstr "" -#: apps/activity/models.py:20 apps/activity/models.py:45 -#: apps/member/models.py:61 apps/member/models.py:112 -#: apps/note/models/notes.py:178 apps/note/models/transactions.py:24 -#: templates/member/profile_detail.html:10 +#: apps/activity/models.py:19 apps/activity/models.py:44 +#: apps/member/models.py:60 apps/member/models.py:111 +#: apps/note/models/notes.py:176 apps/note/models/transactions.py:23 +#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:10 msgid "name" msgstr "" -#: apps/activity/models.py:24 +#: apps/activity/models.py:23 msgid "can invite" msgstr "" -#: apps/activity/models.py:27 +#: apps/activity/models.py:26 msgid "guest entry fee" msgstr "" -#: apps/activity/models.py:31 +#: apps/activity/models.py:30 msgid "activity type" msgstr "" -#: apps/activity/models.py:32 +#: apps/activity/models.py:31 msgid "activity types" msgstr "" -#: apps/activity/models.py:49 +#: apps/activity/models.py:48 msgid "description" msgstr "" -#: apps/activity/models.py:55 apps/note/models/notes.py:154 -#: apps/note/models/transactions.py:39 apps/note/models/transactions.py:85 +#: apps/activity/models.py:54 apps/note/models/notes.py:152 +#: apps/note/models/transactions.py:60 apps/note/models/transactions.py:104 msgid "type" msgstr "" -#: apps/activity/models.py:61 +#: apps/activity/models.py:60 msgid "organizer" msgstr "" -#: apps/activity/models.py:67 +#: apps/activity/models.py:66 msgid "attendees club" msgstr "" -#: apps/activity/models.py:70 +#: apps/activity/models.py:69 msgid "start date" msgstr "" -#: apps/activity/models.py:73 +#: apps/activity/models.py:72 msgid "end date" msgstr "" -#: apps/activity/models.py:78 +#: apps/activity/models.py:77 msgid "activities" msgstr "" -#: apps/activity/models.py:109 +#: apps/activity/models.py:108 msgid "guest" msgstr "" -#: apps/activity/models.py:110 +#: apps/activity/models.py:109 msgid "guests" msgstr "" -#: apps/member/apps.py:11 +#: apps/member/apps.py:10 msgid "member" msgstr "" -#: apps/member/models.py:25 +#: apps/member/models.py:23 msgid "phone number" msgstr "" -#: apps/member/models.py:31 templates/member/profile_detail.html:18 +#: apps/member/models.py:29 templates/member/profile_detail.html:18 msgid "section" msgstr "" -#: apps/member/models.py:32 +#: apps/member/models.py:30 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:38 templates/member/profile_detail.html:20 +#: apps/member/models.py:36 templates/member/profile_detail.html:20 msgid "address" msgstr "" -#: apps/member/models.py:44 +#: apps/member/models.py:42 msgid "paid" msgstr "" -#: apps/member/models.py:49 apps/member/models.py:50 +#: apps/member/models.py:47 apps/member/models.py:48 msgid "user profile" msgstr "" -#: apps/member/models.py:66 +#: apps/member/models.py:65 msgid "email" msgstr "" -#: apps/member/models.py:71 +#: apps/member/models.py:70 msgid "membership fee" msgstr "" -#: apps/member/models.py:75 +#: apps/member/models.py:74 msgid "membership duration" msgstr "" -#: apps/member/models.py:76 +#: apps/member/models.py:75 msgid "The longest time a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:81 +#: apps/member/models.py:80 msgid "membership start" msgstr "" -#: apps/member/models.py:82 +#: apps/member/models.py:81 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:87 +#: apps/member/models.py:86 msgid "membership end" msgstr "" -#: apps/member/models.py:88 +#: apps/member/models.py:87 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:94 apps/note/models/notes.py:129 +#: apps/member/models.py:93 apps/note/models/notes.py:127 msgid "club" msgstr "" -#: apps/member/models.py:95 +#: apps/member/models.py:94 msgid "clubs" msgstr "" -#: apps/member/models.py:118 +#: apps/member/models.py:117 msgid "role" msgstr "" -#: apps/member/models.py:119 +#: apps/member/models.py:118 msgid "roles" msgstr "" -#: apps/member/models.py:140 +#: apps/member/models.py:142 msgid "membership starts on" msgstr "" -#: apps/member/models.py:143 +#: apps/member/models.py:145 msgid "membership ends on" msgstr "" -#: apps/member/models.py:147 +#: apps/member/models.py:149 msgid "fee" msgstr "" -#: apps/member/models.py:151 +#: apps/member/models.py:153 msgid "membership" msgstr "" -#: apps/member/models.py:152 +#: apps/member/models.py:154 msgid "memberships" msgstr "" -#: apps/note/admin.py:112 apps/note/models/transactions.py:65 +#: apps/member/views.py:78 apps/note/models/notes.py:229 +msgid "An alias with a similar name already exists." +msgstr "" + +#: apps/note/admin.py:118 apps/note/models/transactions.py:86 msgid "source" msgstr "" -#: apps/note/admin.py:120 apps/note/admin.py:148 -#: apps/note/models/transactions.py:32 apps/note/models/transactions.py:71 +#: apps/note/admin.py:126 apps/note/admin.py:154 +#: apps/note/models/transactions.py:51 apps/note/models/transactions.py:92 msgid "destination" msgstr "" -#: apps/note/apps.py:15 apps/note/models/notes.py:51 +#: apps/note/apps.py:14 apps/note/models/notes.py:48 msgid "note" msgstr "" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:26 msgid "account balance" msgstr "" -#: apps/note/models/notes.py:29 +#: apps/note/models/notes.py:27 msgid "in centimes, money credited for this instance" msgstr "" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:31 msgid "active" msgstr "" -#: apps/note/models/notes.py:36 +#: apps/note/models/notes.py:34 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:38 msgid "display image" msgstr "" -#: apps/note/models/notes.py:46 apps/note/models/transactions.py:74 +#: apps/note/models/notes.py:43 apps/note/models/transactions.py:95 msgid "created at" msgstr "" -#: apps/note/models/notes.py:52 +#: apps/note/models/notes.py:49 msgid "notes" msgstr "" -#: apps/note/models/notes.py:60 +#: apps/note/models/notes.py:57 msgid "Note" msgstr "" -#: apps/note/models/notes.py:70 apps/note/models/notes.py:92 +#: apps/note/models/notes.py:67 apps/note/models/notes.py:90 msgid "This alias is already taken." msgstr "" -#: apps/note/models/notes.py:107 +#: apps/note/models/notes.py:105 msgid "user" msgstr "" -#: apps/note/models/notes.py:111 +#: apps/note/models/notes.py:109 msgid "one's note" msgstr "" -#: apps/note/models/notes.py:112 +#: apps/note/models/notes.py:110 msgid "users note" msgstr "" -#: apps/note/models/notes.py:118 +#: apps/note/models/notes.py:116 #, python-format msgid "%(user)s's note" msgstr "" -#: apps/note/models/notes.py:133 +#: apps/note/models/notes.py:131 msgid "club note" msgstr "" -#: apps/note/models/notes.py:134 +#: apps/note/models/notes.py:132 msgid "clubs notes" msgstr "" -#: apps/note/models/notes.py:140 +#: apps/note/models/notes.py:138 #, python-format msgid "Note of %(club)s club" msgstr "" -#: apps/note/models/notes.py:160 +#: apps/note/models/notes.py:158 msgid "special note" msgstr "" -#: apps/note/models/notes.py:161 +#: apps/note/models/notes.py:159 msgid "special notes" msgstr "" -#: apps/note/models/notes.py:184 +#: apps/note/models/notes.py:182 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:200 +#: apps/note/models/notes.py:198 msgid "alias" msgstr "" -#: apps/note/models/notes.py:201 +#: apps/note/models/notes.py:199 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:229 +#: apps/note/models/notes.py:225 msgid "Alias too long." msgstr "" -#: apps/note/models/notes.py:232 -msgid "An alias with a similar name already exists." +#: apps/note/models/notes.py:236 +msgid "You can't delete your main alias." msgstr "" -#: apps/note/models/transactions.py:35 apps/note/models/transactions.py:82 +#: apps/note/models/transactions.py:29 +msgid "transaction category" +msgstr "" + +#: apps/note/models/transactions.py:30 +msgid "transaction categories" +msgstr "" + +#: apps/note/models/transactions.py:54 apps/note/models/transactions.py:102 msgid "amount" msgstr "" -#: apps/note/models/transactions.py:36 +#: apps/note/models/transactions.py:55 msgid "in centimes" msgstr "" -#: apps/note/models/transactions.py:44 +#: apps/note/models/transactions.py:65 msgid "transaction template" msgstr "" -#: apps/note/models/transactions.py:45 +#: apps/note/models/transactions.py:66 msgid "transaction templates" msgstr "" -#: apps/note/models/transactions.py:78 +#: apps/note/models/transactions.py:99 msgid "quantity" msgstr "" -#: apps/note/models/transactions.py:89 +#: apps/note/models/transactions.py:108 msgid "reason" msgstr "" -#: apps/note/models/transactions.py:93 +#: apps/note/models/transactions.py:112 msgid "valid" msgstr "" -#: apps/note/models/transactions.py:98 +#: apps/note/models/transactions.py:117 msgid "transaction" msgstr "" -#: apps/note/models/transactions.py:99 +#: apps/note/models/transactions.py:118 msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:141 +#: apps/note/models/transactions.py:160 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:142 +#: apps/note/models/transactions.py:161 msgid "membership transactions" msgstr "" -#: apps/note/views.py:26 +#: apps/note/views.py:29 msgid "Transfer money from your account to one or others" msgstr "" -#: note_kfet/settings/base.py:130 +#: note_kfet/settings/base.py:148 msgid "German" msgstr "" -#: note_kfet/settings/base.py:131 +#: note_kfet/settings/base.py:149 msgid "English" msgstr "" -#: note_kfet/settings/base.py:132 +#: note_kfet/settings/base.py:150 msgid "French" msgstr "" @@ -369,6 +381,18 @@ msgstr "" msgid "balance" msgstr "" +#: templates/member/manage_auth_tokens.html:16 +msgid "Token" +msgstr "" + +#: templates/member/manage_auth_tokens.html:23 +msgid "Created" +msgstr "" + +#: templates/member/manage_auth_tokens.html:31 +msgid "Regenerate token" +msgstr "" + #: templates/member/profile_detail.html:12 msgid "first name" msgstr "" @@ -377,15 +401,19 @@ msgstr "" msgid "username" msgstr "" -#: templates/member/profile_detail.html:26 +#: templates/member/profile_detail.html:27 +msgid "Manage auth token" +msgstr "" + +#: templates/member/profile_detail.html:29 msgid "Update Profile" msgstr "" -#: templates/member/profile_detail.html:27 +#: templates/member/profile_detail.html:30 msgid "Change password" msgstr "" -#: templates/member/profile_detail.html:35 +#: templates/member/profile_detail.html:38 msgid "View my memberships" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 0c742fd5..04efe8d9 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-06 21:37+0100\n" +"POT-Creation-Date: 2020-02-21 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,396 +13,411 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps/activity/apps.py:11 apps/activity/models.py:77 +#: apps/activity/apps.py:10 apps/activity/models.py:76 msgid "activity" msgstr "activité" -#: apps/activity/models.py:20 apps/activity/models.py:45 -#: apps/member/models.py:61 apps/member/models.py:112 -#: apps/note/models/notes.py:178 apps/note/models/transactions.py:24 -#: templates/member/profile_detail.html:10 +#: apps/activity/models.py:19 apps/activity/models.py:44 +#: apps/member/models.py:60 apps/member/models.py:111 +#: apps/note/models/notes.py:176 apps/note/models/transactions.py:23 +#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:10 msgid "name" msgstr "nom" -#: apps/activity/models.py:24 +#: apps/activity/models.py:23 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:27 +#: apps/activity/models.py:26 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: apps/activity/models.py:31 +#: apps/activity/models.py:30 msgid "activity type" msgstr "type d'activité" -#: apps/activity/models.py:32 +#: apps/activity/models.py:31 msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:49 +#: apps/activity/models.py:48 msgid "description" msgstr "description" -#: apps/activity/models.py:55 apps/note/models/notes.py:154 -#: apps/note/models/transactions.py:39 apps/note/models/transactions.py:85 +#: apps/activity/models.py:54 apps/note/models/notes.py:152 +#: apps/note/models/transactions.py:60 apps/note/models/transactions.py:104 msgid "type" msgstr "type" -#: apps/activity/models.py:61 +#: apps/activity/models.py:60 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:67 +#: apps/activity/models.py:66 msgid "attendees club" msgstr "" -#: apps/activity/models.py:70 +#: apps/activity/models.py:69 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:73 +#: apps/activity/models.py:72 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:78 +#: apps/activity/models.py:77 msgid "activities" msgstr "activités" -#: apps/activity/models.py:109 +#: apps/activity/models.py:108 msgid "guest" msgstr "invité" -#: apps/activity/models.py:110 +#: apps/activity/models.py:109 msgid "guests" msgstr "invités" -#: apps/member/apps.py:11 +#: apps/member/apps.py:10 msgid "member" msgstr "adhérent" -#: apps/member/models.py:25 +#: apps/member/models.py:23 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:31 templates/member/profile_detail.html:18 +#: apps/member/models.py:29 templates/member/profile_detail.html:18 msgid "section" msgstr "section" -#: apps/member/models.py:32 +#: apps/member/models.py:30 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:38 templates/member/profile_detail.html:20 +#: apps/member/models.py:36 templates/member/profile_detail.html:20 msgid "address" msgstr "adresse" -#: apps/member/models.py:44 +#: apps/member/models.py:42 msgid "paid" msgstr "payé" -#: apps/member/models.py:49 apps/member/models.py:50 +#: apps/member/models.py:47 apps/member/models.py:48 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:66 +#: apps/member/models.py:65 msgid "email" msgstr "courriel" -#: apps/member/models.py:71 +#: apps/member/models.py:70 msgid "membership fee" msgstr "cotisation pour adhérer" -#: apps/member/models.py:75 +#: apps/member/models.py:74 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:76 +#: apps/member/models.py:75 msgid "The longest time a membership can last (NULL = infinite)." msgstr "La durée maximale d'une adhésion (NULL = infinie)." -#: apps/member/models.py:81 +#: apps/member/models.py:80 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:82 +#: apps/member/models.py:81 msgid "How long after January 1st the members can renew their membership." -msgstr "" +msgstr "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:87 +#: apps/member/models.py:86 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:88 +#: apps/member/models.py:87 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." -#: apps/member/models.py:94 apps/note/models/notes.py:129 +#: apps/member/models.py:93 apps/note/models/notes.py:127 msgid "club" msgstr "club" -#: apps/member/models.py:95 +#: apps/member/models.py:94 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:118 +#: apps/member/models.py:117 msgid "role" msgstr "rôle" -#: apps/member/models.py:119 +#: apps/member/models.py:118 msgid "roles" msgstr "rôles" -#: apps/member/models.py:140 +#: apps/member/models.py:142 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:143 +#: apps/member/models.py:145 msgid "membership ends on" msgstr "l'adhésion finie le" -#: apps/member/models.py:147 +#: apps/member/models.py:149 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:151 +#: apps/member/models.py:153 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:152 +#: apps/member/models.py:154 msgid "memberships" msgstr "adhésions" -#: apps/note/admin.py:112 apps/note/models/transactions.py:65 +#: apps/member/views.py:78 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à." + +#: apps/note/admin.py:118 apps/note/models/transactions.py:86 msgid "source" msgstr "source" -#: apps/note/admin.py:120 apps/note/admin.py:148 -#: apps/note/models/transactions.py:32 apps/note/models/transactions.py:71 +#: apps/note/admin.py:126 apps/note/admin.py:154 +#: apps/note/models/transactions.py:51 apps/note/models/transactions.py:92 msgid "destination" msgstr "destination" -#: apps/note/apps.py:15 apps/note/models/notes.py:51 +#: apps/note/apps.py:14 apps/note/models/notes.py:48 msgid "note" msgstr "note" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:26 msgid "account balance" msgstr "solde du compte" -#: apps/note/models/notes.py:29 +#: apps/note/models/notes.py:27 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:31 msgid "active" msgstr "actif" -#: apps/note/models/notes.py:36 +#: apps/note/models/notes.py:34 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:38 msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:46 apps/note/models/transactions.py:74 +#: apps/note/models/notes.py:43 apps/note/models/transactions.py:95 msgid "created at" msgstr "créée le" -#: apps/note/models/notes.py:52 +#: apps/note/models/notes.py:49 msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:60 +#: apps/note/models/notes.py:57 msgid "Note" msgstr "Note" -#: apps/note/models/notes.py:70 apps/note/models/notes.py:92 +#: apps/note/models/notes.py:67 apps/note/models/notes.py:90 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:107 +#: apps/note/models/notes.py:105 msgid "user" msgstr "utilisateur" -#: apps/note/models/notes.py:111 +#: apps/note/models/notes.py:109 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:112 +#: apps/note/models/notes.py:110 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:118 +#: apps/note/models/notes.py:116 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:133 +#: apps/note/models/notes.py:131 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:134 +#: apps/note/models/notes.py:132 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:140 -#, fuzzy, python-format -#| msgid "Note for %(club)s club" +#: apps/note/models/notes.py:138 +#, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:160 +#: apps/note/models/notes.py:158 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:161 +#: apps/note/models/notes.py:159 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:184 +#: apps/note/models/notes.py:182 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:200 +#: apps/note/models/notes.py:198 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:201 +#: apps/note/models/notes.py:199 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:229 +#: apps/note/models/notes.py:225 msgid "Alias too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:232 -msgid "An alias with a similar name already exists." -msgstr "Un alias avec un nom similaire existe déjà." +#: apps/note/models/notes.py:236 +msgid "You can't delete your main alias." +msgstr "Vous ne pouvez pas supprimer votre alias principal." -#: apps/note/models/transactions.py:35 apps/note/models/transactions.py:82 +#: apps/note/models/transactions.py:29 +msgid "transaction category" +msgstr "catégorie de transaction" + +#: apps/note/models/transactions.py:30 +msgid "transaction categories" +msgstr "catégories de transaction" + +#: apps/note/models/transactions.py:54 apps/note/models/transactions.py:102 msgid "amount" msgstr "montant" -#: apps/note/models/transactions.py:36 +#: apps/note/models/transactions.py:55 msgid "in centimes" msgstr "en centimes" -#: apps/note/models/transactions.py:44 +#: apps/note/models/transactions.py:65 msgid "transaction template" msgstr "modèle de transaction" -#: apps/note/models/transactions.py:45 +#: apps/note/models/transactions.py:66 msgid "transaction templates" msgstr "modèles de transaction" -#: apps/note/models/transactions.py:78 +#: apps/note/models/transactions.py:99 msgid "quantity" msgstr "quantité" -#: apps/note/models/transactions.py:89 +#: apps/note/models/transactions.py:108 msgid "reason" msgstr "raison" -#: apps/note/models/transactions.py:93 +#: apps/note/models/transactions.py:112 msgid "valid" msgstr "valide" -#: apps/note/models/transactions.py:98 +#: apps/note/models/transactions.py:117 msgid "transaction" msgstr "transaction" -#: apps/note/models/transactions.py:99 +#: apps/note/models/transactions.py:118 msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:141 +#: apps/note/models/transactions.py:160 msgid "membership transaction" msgstr "transaction d'adhésion" -#: apps/note/models/transactions.py:142 +#: apps/note/models/transactions.py:161 msgid "membership transactions" msgstr "transactions d'adhésion" -#: apps/note/views.py:26 +#: apps/note/views.py:29 msgid "Transfer money from your account to one or others" msgstr "Transfert d'argent de ton compte vers un ou plusieurs autres" -#: note_kfet/settings/base.py:130 +#: note_kfet/settings/base.py:148 msgid "German" msgstr "" -#: note_kfet/settings/base.py:131 +#: note_kfet/settings/base.py:149 msgid "English" msgstr "" -#: note_kfet/settings/base.py:132 +#: note_kfet/settings/base.py:150 msgid "French" msgstr "" #: templates/base.html:14 msgid "The ENS Paris-Saclay BDE note." -msgstr "" +msgstr "La note du BDE de l'ENS Paris-Saclay." #: templates/member/club_detail.html:10 -#, fuzzy -#| msgid "membership starts on" msgid "Membership starts on" -msgstr "l'adhésion commence le" +msgstr "L'adhésion commence le" #: templates/member/club_detail.html:12 -#, fuzzy -#| msgid "membership ends on" msgid "Membership ends on" -msgstr "l'adhésion finie le" +msgstr "L'adhésion finie le" #: templates/member/club_detail.html:14 -#, fuzzy -#| msgid "membership duration" msgid "Membership duration" -msgstr "durée de l'adhésion" +msgstr "Durée de l'adhésion" #: templates/member/club_detail.html:18 templates/member/profile_detail.html:22 -#, fuzzy -#| msgid "account balance" msgid "balance" msgstr "solde du compte" +#: templates/member/manage_auth_tokens.html:16 +msgid "Token" +msgstr "Jeton" + +#: templates/member/manage_auth_tokens.html:23 +msgid "Created" +msgstr "Créé le" + +#: templates/member/manage_auth_tokens.html:31 +msgid "Regenerate token" +msgstr "Regénérer le jeton" + #: templates/member/profile_detail.html:12 msgid "first name" msgstr "" #: templates/member/profile_detail.html:14 -#, fuzzy -#| msgid "name" msgid "username" -msgstr "nom" - -#: templates/member/profile_detail.html:26 -#, fuzzy -#| msgid "user profile" -msgid "Update Profile" -msgstr "profil utilisateur" +msgstr "nom d'utilisateur" #: templates/member/profile_detail.html:27 -msgid "Change password" -msgstr "" +msgid "Manage auth token" +msgstr "Gérer les jetons d'authentification" -#: templates/member/profile_detail.html:35 -#, fuzzy -#| msgid "memberships" +#: 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" + +#: templates/member/profile_detail.html:38 msgid "View my memberships" -msgstr "adhésions" +msgstr "Voir mes adhésions" #: templates/member/profile_update.html:13 msgid "Save Changes" -msgstr "" +msgstr "Sauvegarder les changements" #: templates/member/signup.html:14 msgid "Sign Up" From 2e7bf4964b150796e69dea365dc20360f3f844f5 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 11:02:29 +0100 Subject: [PATCH 3/9] Upgrade bootstrap and flex footer --- templates/base.html | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/templates/base.html b/templates/base.html index 81ebed37..80f9df9a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - - + {% block title %}{{ title }}{% endblock title %} - {{ request.site.name }} @@ -26,8 +25,8 @@ SPDX-License-Identifier: GPL-3.0-or-later {# Bootstrap CSS #} @@ -39,8 +38,8 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block extracss %}{% endblock %} - -
+ +
-
+
@@ -149,14 +148,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
{# Bootstrap JavaScript #} - - - {% block extrajavascript %} {% endblock extrajavascript %} From 43fd765a3407c84bc3ea53afd70d664cedb22f0a Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 11:17:14 +0100 Subject: [PATCH 4/9] 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 %} From 45ce2eab9e5253e1c490ebd76d6f5cda3d973869 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 11:53:37 +0100 Subject: [PATCH 5/9] Two colomn profile page --- apps/member/views.py | 6 +- locale/de/LC_MESSAGES/django.po | 33 ++++--- locale/fr/LC_MESSAGES/django.po | 37 +++++--- templates/member/profile_detail.html | 124 +++++++++++++++------------ 4 files changed, 117 insertions(+), 83 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index fab68b01..3570f7b2 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -112,7 +112,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): class UserDetailView(LoginRequiredMixin, DetailView): """ - Affiche les informations sur un utilisateur, sa note, ses clubs ... + Affiche les informations sur un utilisateur, sa note, ses clubs... """ model = Profile context_object_name = "profile" @@ -126,6 +126,10 @@ class UserDetailView(LoginRequiredMixin, DetailView): club_list = \ Membership.objects.all().filter(user=user).only("club") context['club_list'] = ClubTable(club_list) + context['title'] = _("Account #%(id)s: %(username)s") % { + 'id': user.pk, + 'username': user.username, + } return context diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 296375b2..2994b8b1 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 11:16+0100\n" +"POT-Creation-Date: 2020-02-21 11:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,7 +90,7 @@ msgstr "" msgid "phone number" msgstr "" -#: apps/member/models.py:29 templates/member/profile_detail.html:18 +#: apps/member/models.py:29 templates/member/profile_detail.html:23 msgid "section" msgstr "" @@ -98,7 +98,7 @@ msgstr "" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:36 templates/member/profile_detail.html:20 +#: apps/member/models.py:36 templates/member/profile_detail.html:26 msgid "address" msgstr "" @@ -180,7 +180,7 @@ msgstr "" msgid "memberships" msgstr "" -#: apps/member/views.py:63 templates/member/profile_detail.html:29 +#: apps/member/views.py:63 templates/member/profile_detail.html:39 msgid "Update Profile" msgstr "" @@ -188,6 +188,11 @@ msgstr "" msgid "An alias with a similar name already exists." msgstr "" +#: apps/member/views.py:129 +#, python-format +msgid "Account #%(id)s: %(username)s" +msgstr "" + #: apps/note/admin.py:118 apps/note/models/transactions.py:86 msgid "source" msgstr "" @@ -285,7 +290,7 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:199 +#: apps/note/models/notes.py:199 templates/member/profile_detail.html:32 msgid "aliases" msgstr "" @@ -381,7 +386,7 @@ msgstr "" msgid "Membership duration" msgstr "" -#: templates/member/club_detail.html:18 templates/member/profile_detail.html:22 +#: templates/member/club_detail.html:18 templates/member/profile_detail.html:29 msgid "balance" msgstr "" @@ -397,23 +402,27 @@ msgstr "" msgid "Regenerate token" msgstr "" -#: templates/member/profile_detail.html:12 +#: templates/member/profile_detail.html:10 msgid "first name" msgstr "" -#: templates/member/profile_detail.html:14 +#: templates/member/profile_detail.html:13 msgid "username" msgstr "" -#: templates/member/profile_detail.html:27 -msgid "Manage auth token" +#: templates/member/profile_detail.html:16 +msgid "password" msgstr "" -#: templates/member/profile_detail.html:30 +#: templates/member/profile_detail.html:19 msgid "Change password" msgstr "" -#: templates/member/profile_detail.html:38 +#: templates/member/profile_detail.html:37 +msgid "Manage auth token" +msgstr "" + +#: templates/member/profile_detail.html:49 msgid "View my memberships" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index b78eb5fd..927349ce 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 11:16+0100\n" +"POT-Creation-Date: 2020-02-21 11:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,7 +85,7 @@ msgstr "adhérent" msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:29 templates/member/profile_detail.html:18 +#: apps/member/models.py:29 templates/member/profile_detail.html:23 msgid "section" msgstr "section" @@ -93,7 +93,7 @@ msgstr "section" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:36 templates/member/profile_detail.html:20 +#: apps/member/models.py:36 templates/member/profile_detail.html:26 msgid "address" msgstr "adresse" @@ -179,7 +179,7 @@ msgstr "adhésion" msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:63 templates/member/profile_detail.html:29 +#: apps/member/views.py:63 templates/member/profile_detail.html:39 msgid "Update Profile" msgstr "Modifier le profil" @@ -187,6 +187,11 @@ msgstr "Modifier le profil" msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." +#: apps/member/views.py:129 +#, python-format +msgid "Account #%(id)s: %(username)s" +msgstr "Compte n°%(id)s : %(username)s" + #: apps/note/admin.py:118 apps/note/models/transactions.py:86 msgid "source" msgstr "source" @@ -285,7 +290,7 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:199 +#: apps/note/models/notes.py:199 templates/member/profile_detail.html:32 msgid "aliases" msgstr "alias" @@ -381,7 +386,7 @@ msgstr "L'adhésion finie le" msgid "Membership duration" msgstr "Durée de l'adhésion" -#: templates/member/club_detail.html:18 templates/member/profile_detail.html:22 +#: templates/member/club_detail.html:18 templates/member/profile_detail.html:29 msgid "balance" msgstr "solde du compte" @@ -397,23 +402,29 @@ msgstr "Créé le" msgid "Regenerate token" msgstr "Regénérer le jeton" -#: templates/member/profile_detail.html:12 +#: templates/member/profile_detail.html:10 msgid "first name" msgstr "" -#: templates/member/profile_detail.html:14 +#: templates/member/profile_detail.html:13 msgid "username" msgstr "nom d'utilisateur" -#: templates/member/profile_detail.html:27 -msgid "Manage auth token" -msgstr "Gérer les jetons d'authentification" +#: templates/member/profile_detail.html:16 +#, fuzzy +#| msgid "Change password" +msgid "password" +msgstr "Changer le mot de passe" -#: templates/member/profile_detail.html:30 +#: templates/member/profile_detail.html:19 msgid "Change password" msgstr "Changer le mot de passe" -#: templates/member/profile_detail.html:38 +#: templates/member/profile_detail.html:37 +msgid "Manage auth token" +msgstr "Gérer les jetons d'authentification" + +#: templates/member/profile_detail.html:49 msgid "View my memberships" msgstr "Voir mes adhésions" diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index dbf7075b..1b233af1 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -2,67 +2,77 @@ {% load i18n static pretty_money django_tables2 %} {% block content %} -

Compte n° {{ object.pk }}

+
+
+ - +
+
{% trans 'name'|capfirst %}, {% trans 'first name' %}
+
{{ object.user.last_name }} {{ object.user.first_name }}
-
-
{% trans 'name'|capfirst %}
-
{{ object.user.last_name }}
-
{% trans 'first name'|capfirst %}
-
{{ object.user.first_name }}
-
{% trans 'username'|capfirst %}
-
{{ object.user.username }}
-
Aliases
-
{{ object.user.note.alias_set.all }}
-
{% trans 'section'|capfirst %}
-
{{ object.section }}
-
{% trans 'address'|capfirst %}
-
{{ object.address }}
-
{% trans 'balance'|capfirst %}
-
{{ object.user.note.balance | pretty_money }}
-
-
- {% if object.user.pk == user.pk %} - {% trans 'Manage auth token' %} - {% endif %} - {% trans 'Update Profile' %} - {% trans 'Change password' %} -
+
{% trans 'username'|capfirst %}
+
{{ object.user.username }}
-
-
-
-
- -
+
{% trans 'password'|capfirst %}
+
+ + {% trans 'Change password' %} + +
+ +
{% trans 'section'|capfirst %}
+
{{ object.section }}
+ +
{% trans 'address'|capfirst %}
+
{{ object.address }}
+ +
{% trans 'balance'|capfirst %}
+
{{ object.user.note.balance | pretty_money }}
+ +
{% trans 'aliases'|capfirst %}
+
{{ object.user.note.alias_set.all|join:", " }}
+
+

+ {% if object.user.pk == user.pk %} + {% trans 'Manage auth token' %} + {% endif %} + {% trans 'Update Profile' %} +

-
-
- {% render_table club_list %} -
+
+
+
+
+
+ +
+
+ +
+
+ {% render_table club_list %} +
+
+
+ +
+
+
+ +
+
+
+
+ {% render_table history_list %} +
+
+
+
-
-
-
-
- -
-
-
-
- {% render_table history_list %} -
-
-
- - - - - {% endblock %} +{% endblock %} From 6caad0b369b200bfce6f1c0d3b08a322c3764b67 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 11:55:44 +0100 Subject: [PATCH 6/9] Do not forget responsible grid on second profile page column --- templates/member/profile_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 1b233af1..353d4bf1 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -40,7 +40,7 @@

-
+
From 8d87b2b8f5ebfc319318fc94b541ef9c887bee90 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 12:08:36 +0100 Subject: [PATCH 7/9] More style in profile page --- locale/de/LC_MESSAGES/django.po | 26 ++++++------ locale/fr/LC_MESSAGES/django.po | 26 ++++++------ templates/member/profile_detail.html | 60 +++++++++++++++------------- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 2994b8b1..7fb96c19 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 11:52+0100\n" +"POT-Creation-Date: 2020-02-21 12:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" #: apps/activity/models.py:19 apps/activity/models.py:44 #: apps/member/models.py:60 apps/member/models.py:111 #: apps/note/models/notes.py:176 apps/note/models/transactions.py:23 -#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:10 +#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:11 msgid "name" msgstr "" @@ -90,7 +90,7 @@ msgstr "" msgid "phone number" msgstr "" -#: apps/member/models.py:29 templates/member/profile_detail.html:23 +#: apps/member/models.py:29 templates/member/profile_detail.html:24 msgid "section" msgstr "" @@ -98,7 +98,7 @@ msgstr "" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:36 templates/member/profile_detail.html:26 +#: apps/member/models.py:36 templates/member/profile_detail.html:27 msgid "address" msgstr "" @@ -180,7 +180,7 @@ msgstr "" msgid "memberships" msgstr "" -#: apps/member/views.py:63 templates/member/profile_detail.html:39 +#: apps/member/views.py:63 templates/member/profile_detail.html:42 msgid "Update Profile" msgstr "" @@ -290,7 +290,7 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:199 templates/member/profile_detail.html:32 +#: apps/note/models/notes.py:199 templates/member/profile_detail.html:33 msgid "aliases" msgstr "" @@ -386,7 +386,7 @@ msgstr "" msgid "Membership duration" msgstr "" -#: templates/member/club_detail.html:18 templates/member/profile_detail.html:29 +#: templates/member/club_detail.html:18 templates/member/profile_detail.html:30 msgid "balance" msgstr "" @@ -402,27 +402,27 @@ msgstr "" msgid "Regenerate token" msgstr "" -#: templates/member/profile_detail.html:10 +#: templates/member/profile_detail.html:11 msgid "first name" msgstr "" -#: templates/member/profile_detail.html:13 +#: templates/member/profile_detail.html:14 msgid "username" msgstr "" -#: templates/member/profile_detail.html:16 +#: templates/member/profile_detail.html:17 msgid "password" msgstr "" -#: templates/member/profile_detail.html:19 +#: templates/member/profile_detail.html:20 msgid "Change password" msgstr "" -#: templates/member/profile_detail.html:37 +#: templates/member/profile_detail.html:38 msgid "Manage auth token" msgstr "" -#: templates/member/profile_detail.html:49 +#: templates/member/profile_detail.html:53 msgid "View my memberships" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 927349ce..4d7c650b 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 11:52+0100\n" +"POT-Creation-Date: 2020-02-21 12:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "activité" #: apps/activity/models.py:19 apps/activity/models.py:44 #: apps/member/models.py:60 apps/member/models.py:111 #: apps/note/models/notes.py:176 apps/note/models/transactions.py:23 -#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:10 +#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:11 msgid "name" msgstr "nom" @@ -85,7 +85,7 @@ msgstr "adhérent" msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:29 templates/member/profile_detail.html:23 +#: apps/member/models.py:29 templates/member/profile_detail.html:24 msgid "section" msgstr "section" @@ -93,7 +93,7 @@ msgstr "section" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:36 templates/member/profile_detail.html:26 +#: apps/member/models.py:36 templates/member/profile_detail.html:27 msgid "address" msgstr "adresse" @@ -179,7 +179,7 @@ msgstr "adhésion" msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:63 templates/member/profile_detail.html:39 +#: apps/member/views.py:63 templates/member/profile_detail.html:42 msgid "Update Profile" msgstr "Modifier le profil" @@ -290,7 +290,7 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:199 templates/member/profile_detail.html:32 +#: apps/note/models/notes.py:199 templates/member/profile_detail.html:33 msgid "aliases" msgstr "alias" @@ -386,7 +386,7 @@ msgstr "L'adhésion finie le" msgid "Membership duration" msgstr "Durée de l'adhésion" -#: templates/member/club_detail.html:18 templates/member/profile_detail.html:29 +#: templates/member/club_detail.html:18 templates/member/profile_detail.html:30 msgid "balance" msgstr "solde du compte" @@ -402,29 +402,29 @@ msgstr "Créé le" msgid "Regenerate token" msgstr "Regénérer le jeton" -#: templates/member/profile_detail.html:10 +#: templates/member/profile_detail.html:11 msgid "first name" msgstr "" -#: templates/member/profile_detail.html:13 +#: templates/member/profile_detail.html:14 msgid "username" msgstr "nom d'utilisateur" -#: templates/member/profile_detail.html:16 +#: templates/member/profile_detail.html:17 #, fuzzy #| msgid "Change password" msgid "password" msgstr "Changer le mot de passe" -#: templates/member/profile_detail.html:19 +#: templates/member/profile_detail.html:20 msgid "Change password" msgstr "Changer le mot de passe" -#: templates/member/profile_detail.html:37 +#: templates/member/profile_detail.html:38 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: templates/member/profile_detail.html:49 +#: templates/member/profile_detail.html:53 msgid "View my memberships" msgstr "Voir mes adhésions" diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 353d4bf1..87cdc531 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -3,41 +3,45 @@ {% block content %}
-
- +
+
+ +
+
+
{% trans 'name'|capfirst %}, {% trans 'first name' %}
+
{{ object.user.last_name }} {{ object.user.first_name }}
-
-
{% trans 'name'|capfirst %}, {% trans 'first name' %}
-
{{ object.user.last_name }} {{ object.user.first_name }}
+
{% trans 'username'|capfirst %}
+
{{ object.user.username }}
-
{% trans 'username'|capfirst %}
-
{{ object.user.username }}
+
{% trans 'password'|capfirst %}
+
+ + {% trans 'Change password' %} + +
-
{% trans 'password'|capfirst %}
-
- - {% trans 'Change password' %} - -
+
{% trans 'section'|capfirst %}
+
{{ object.section }}
-
{% trans 'section'|capfirst %}
-
{{ object.section }}
+
{% trans 'address'|capfirst %}
+
{{ object.address }}
-
{% trans 'address'|capfirst %}
-
{{ object.address }}
+
{% trans 'balance'|capfirst %}
+
{{ object.user.note.balance | pretty_money }}
-
{% trans 'balance'|capfirst %}
-
{{ object.user.note.balance | pretty_money }}
+
{% trans 'aliases'|capfirst %}
+
{{ object.user.note.alias_set.all|join:", " }}
+
-
{% trans 'aliases'|capfirst %}
-
{{ object.user.note.alias_set.all|join:", " }}
-
-

- {% if object.user.pk == user.pk %} - {% trans 'Manage auth token' %} - {% endif %} - {% trans 'Update Profile' %} -

+ {% if object.user.pk == user.pk %} + {% trans 'Manage auth token' %} + {% endif %} +
+
+ {% trans 'Update Profile' %} +
+
From b395d3a63338b233fee3a879a0a143ef1b881c2e Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 12:29:11 +0100 Subject: [PATCH 8/9] Overflow on collapsing tables and Bootstrap4 style --- apps/member/tables.py | 10 +++----- apps/note/tables.py | 4 +-- templates/member/profile_detail.html | 37 ++++++++++++---------------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/apps/member/tables.py b/apps/member/tables.py index 591149ec..a6de17d2 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -10,11 +10,10 @@ from .models import Club class ClubTable(tables.Table): class Meta: attrs = { - 'class': - 'table table-bordered table-condensed table-striped table-hover' + 'class': 'table table-condensed table-striped table-hover' } model = Club - template_name = 'django_tables2/bootstrap.html' + template_name = 'django_tables2/bootstrap4.html' fields = ('id', 'name', 'email') row_attrs = { 'class': 'table-row', @@ -28,9 +27,8 @@ class UserTable(tables.Table): class Meta: attrs = { - 'class': - 'table table-bordered table-condensed table-striped table-hover' + 'class': 'table table-condensed table-striped table-hover' } - template_name = 'django_tables2/bootstrap.html' + template_name = 'django_tables2/bootstrap4.html' fields = ('last_name', 'first_name', 'username', 'email') model = User diff --git a/apps/note/tables.py b/apps/note/tables.py index e2f5c763..43a1ef74 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -11,10 +11,10 @@ class HistoryTable(tables.Table): class Meta: attrs = { 'class': - 'table table-bordered table-condensed table-striped table-hover' + 'table table-condensed table-striped table-hover' } model = Transaction - template_name = 'django_tables2/bootstrap.html' + template_name = 'django_tables2/bootstrap4.html' sequence = ('...', 'total', 'valid') total = tables.Column() # will use Transaction.total() !! diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 87cdc531..9c13d7c7 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -47,33 +47,28 @@
-
-
- -
-
- -
-
- {% render_table club_list %} + +
+ {% render_table club_list %}
-
-
- -
+ -
-
- {% render_table history_list %} -
+
+ {% render_table history_list %}
From 6c017b1993028ecbcb1d04113c15e605ac5621ca Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 21 Feb 2020 13:50:35 +0100 Subject: [PATCH 9/9] Remove sidebar and drop shadows --- locale/de/LC_MESSAGES/django.po | 4 ++-- locale/fr/LC_MESSAGES/django.po | 4 ++-- templates/base.html | 24 ++++++++---------------- templates/member/profile_detail.html | 4 ++-- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 7fb96c19..3aadf83e 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 12:08+0100\n" +"POT-Creation-Date: 2020-02-21 13:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -422,7 +422,7 @@ msgstr "" msgid "Manage auth token" msgstr "" -#: templates/member/profile_detail.html:53 +#: templates/member/profile_detail.html:54 msgid "View my memberships" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 4d7c650b..bdf4fc8f 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 12:08+0100\n" +"POT-Creation-Date: 2020-02-21 13:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -424,7 +424,7 @@ msgstr "Changer le mot de passe" msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: templates/member/profile_detail.html:53 +#: templates/member/profile_detail.html:54 msgid "View my memberships" msgstr "Voir mes adhésions" diff --git a/templates/base.html b/templates/base.html index 80f9df9a..ba7b4c9e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -40,7 +40,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
-
-
-
- {% block sidebar %} - {% endblock %} -
-
- {% block contenttitle %}

{{ title }}

{% endblock %} - {% block content %} -

Default content...

- {% endblock content %} -
-
+
+ {% block contenttitle %}

{{ title }}

{% endblock %} + {% block content %} +

Default content...

+ {% endblock content %}