mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-22 06:03:20 +00:00
Merge branch 'bugfix' into 'master'
Fix error 500 with expired reset password links See merge request ae/Sith!234
This commit is contained in:
commit
3eb8292d15
@ -1,10 +1,14 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block content %}
|
||||
{% if form %}
|
||||
<form method="post" action="">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p() }}
|
||||
<input type="submit" value="{% trans %}Reset{% endtrans %}" />
|
||||
</form>
|
||||
{% else %}
|
||||
{% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}<a href="{{ url('core:password_change') }}">{% trans %}lost password{% endtrans %}</a>.
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-09-04 20:43+0200\n"
|
||||
"POT-Creation-Date: 2019-09-10 16:45+0200\n"
|
||||
"PO-Revision-Date: 2016-07-18\n"
|
||||
"Last-Translator: Skia <skia@libskia.so>\n"
|
||||
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
||||
@ -668,7 +668,7 @@ msgid "Done"
|
||||
msgstr "Effectuées"
|
||||
|
||||
#: accounting/templates/accounting/journal_details.jinja:41
|
||||
#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1162
|
||||
#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1168
|
||||
#: pedagogy/templates/pedagogy/moderation.jinja:13
|
||||
#: pedagogy/templates/pedagogy/uv_detail.jinja:138
|
||||
#: trombi/templates/trombi/comment.jinja:4
|
||||
@ -964,11 +964,11 @@ msgstr "Ce champ est obligatoire."
|
||||
msgid "You must specify at least an user or an email address"
|
||||
msgstr "vous devez spécifier au moins un utilisateur ou une adresse email"
|
||||
|
||||
#: club/forms.py:163 counter/views.py:1552
|
||||
#: club/forms.py:163 counter/views.py:1558
|
||||
msgid "Begin date"
|
||||
msgstr "Date de début"
|
||||
|
||||
#: club/forms.py:169 com/views.py:85 com/views.py:210 counter/views.py:1558
|
||||
#: club/forms.py:169 com/views.py:85 com/views.py:210 counter/views.py:1564
|
||||
#: election/views.py:190 subscription/views.py:52
|
||||
msgid "End date"
|
||||
msgstr "Date de fin"
|
||||
@ -1363,7 +1363,7 @@ msgstr "Anciens membres"
|
||||
msgid "History"
|
||||
msgstr "Historique"
|
||||
|
||||
#: club/views.py:115 core/templates/core/base.jinja:117 core/views/user.py:230
|
||||
#: club/views.py:115 core/templates/core/base.jinja:119 core/views/user.py:230
|
||||
#: sas/templates/sas/picture.jinja:95 trombi/views.py:60
|
||||
msgid "Tools"
|
||||
msgstr "Outils"
|
||||
@ -1387,7 +1387,7 @@ msgid "Props"
|
||||
msgstr "Propriétés"
|
||||
|
||||
#: club/views.py:335 core/templates/core/user_stats.jinja:27
|
||||
#: counter/views.py:1706
|
||||
#: counter/views.py:1712
|
||||
msgid "Product"
|
||||
msgstr "Produit"
|
||||
|
||||
@ -1651,7 +1651,7 @@ msgid "Calls to moderate"
|
||||
msgstr "Appels à modérer"
|
||||
|
||||
#: com/templates/com/news_admin_list.jinja:242
|
||||
#: core/templates/core/base.jinja:169
|
||||
#: core/templates/core/base.jinja:171
|
||||
msgid "Events"
|
||||
msgstr "Événements"
|
||||
|
||||
@ -1722,24 +1722,24 @@ msgstr "Agenda"
|
||||
msgid "Birthdays"
|
||||
msgstr "Anniversaires"
|
||||
|
||||
#: com/templates/com/news_list.jinja:48
|
||||
#: com/templates/com/news_list.jinja:50
|
||||
#, python-format
|
||||
msgid "%(age)s year old"
|
||||
msgstr "%(age)s ans"
|
||||
|
||||
#: com/templates/com/news_list.jinja:58 com/tests.py:109 com/tests.py:119
|
||||
#: com/templates/com/news_list.jinja:61 com/tests.py:109 com/tests.py:119
|
||||
msgid "You need an up to date subscription to access this content"
|
||||
msgstr "Votre cotisation doit être à jour pour accéder à cette section"
|
||||
|
||||
#: com/templates/com/news_list.jinja:90
|
||||
#: com/templates/com/news_list.jinja:93
|
||||
msgid "Events today and the next few days"
|
||||
msgstr "Événements aujourd'hui et dans les prochains jours"
|
||||
|
||||
#: com/templates/com/news_list.jinja:133
|
||||
#: com/templates/com/news_list.jinja:136
|
||||
msgid "Nothing to come..."
|
||||
msgstr "Rien à venir..."
|
||||
|
||||
#: com/templates/com/news_list.jinja:140
|
||||
#: com/templates/com/news_list.jinja:143
|
||||
msgid "Coming soon... don't miss!"
|
||||
msgstr "Prochainement... à ne pas rater!"
|
||||
|
||||
@ -2389,7 +2389,7 @@ msgstr "Connexion"
|
||||
msgid "Register"
|
||||
msgstr "S'enregister"
|
||||
|
||||
#: core/templates/core/base.jinja:79 core/templates/core/base.jinja:80
|
||||
#: core/templates/core/base.jinja:81 core/templates/core/base.jinja:82
|
||||
#: forum/templates/forum/macros.jinja:171
|
||||
#: forum/templates/forum/macros.jinja:175
|
||||
#: matmat/templates/matmat/search_form.jinja:37
|
||||
@ -2399,64 +2399,64 @@ msgstr "S'enregister"
|
||||
msgid "Search"
|
||||
msgstr "Recherche"
|
||||
|
||||
#: core/templates/core/base.jinja:106
|
||||
#: core/templates/core/base.jinja:108
|
||||
msgid "View more"
|
||||
msgstr "Voir plus"
|
||||
|
||||
#: core/templates/core/base.jinja:110
|
||||
#: core/templates/core/base.jinja:112
|
||||
#: forum/templates/forum/last_unread.jinja:17
|
||||
msgid "Mark all as read"
|
||||
msgstr "Marquer tout commme lu"
|
||||
|
||||
#: core/templates/core/base.jinja:120
|
||||
#: core/templates/core/base.jinja:122
|
||||
msgid "Logout"
|
||||
msgstr "Déconnexion"
|
||||
|
||||
#: core/templates/core/base.jinja:153
|
||||
#: core/templates/core/base.jinja:155
|
||||
msgid "Main"
|
||||
msgstr "Accueil"
|
||||
|
||||
#: core/templates/core/base.jinja:155
|
||||
#: core/templates/core/base.jinja:157
|
||||
msgid "Associations & Clubs"
|
||||
msgstr "Associations & Clubs"
|
||||
|
||||
#: core/templates/core/base.jinja:159
|
||||
#: core/templates/core/base.jinja:161
|
||||
msgid "AE"
|
||||
msgstr "L'AE"
|
||||
|
||||
#: core/templates/core/base.jinja:160
|
||||
#: core/templates/core/base.jinja:162
|
||||
msgid "AE's clubs"
|
||||
msgstr "Les clubs de L'AE"
|
||||
|
||||
#: core/templates/core/base.jinja:161
|
||||
#: core/templates/core/base.jinja:163
|
||||
msgid "BdF"
|
||||
msgstr "Le BdF"
|
||||
|
||||
#: core/templates/core/base.jinja:162
|
||||
#: core/templates/core/base.jinja:164
|
||||
msgid "BDS"
|
||||
msgstr "Le BDS"
|
||||
|
||||
#: core/templates/core/base.jinja:163
|
||||
#: core/templates/core/base.jinja:165
|
||||
msgid "CETU"
|
||||
msgstr "Le CETU"
|
||||
|
||||
#: core/templates/core/base.jinja:164
|
||||
#: core/templates/core/base.jinja:166
|
||||
msgid "Doceo"
|
||||
msgstr "Doceo"
|
||||
|
||||
#: core/templates/core/base.jinja:165
|
||||
#: core/templates/core/base.jinja:167
|
||||
msgid "Positions"
|
||||
msgstr "Postes à pourvoir"
|
||||
|
||||
#: core/templates/core/base.jinja:173
|
||||
#: core/templates/core/base.jinja:175
|
||||
msgid "Calendar"
|
||||
msgstr "Calendrier"
|
||||
|
||||
#: core/templates/core/base.jinja:174
|
||||
#: core/templates/core/base.jinja:176
|
||||
msgid "Big event"
|
||||
msgstr "Grandes Activités"
|
||||
|
||||
#: core/templates/core/base.jinja:177
|
||||
#: core/templates/core/base.jinja:179
|
||||
#: forum/templates/forum/favorite_topics.jinja:14
|
||||
#: forum/templates/forum/last_unread.jinja:14
|
||||
#: forum/templates/forum/macros.jinja:90 forum/templates/forum/main.jinja:6
|
||||
@ -2465,11 +2465,11 @@ msgstr "Grandes Activités"
|
||||
msgid "Forum"
|
||||
msgstr "Forum"
|
||||
|
||||
#: core/templates/core/base.jinja:178
|
||||
#: core/templates/core/base.jinja:180
|
||||
msgid "Gallery"
|
||||
msgstr "Photos"
|
||||
|
||||
#: core/templates/core/base.jinja:179 counter/models.py:219
|
||||
#: core/templates/core/base.jinja:181 counter/models.py:219
|
||||
#: counter/templates/counter/counter_list.jinja:11
|
||||
#: eboutic/templates/eboutic/eboutic_main.jinja:4
|
||||
#: eboutic/templates/eboutic/eboutic_main.jinja:24
|
||||
@ -2479,75 +2479,75 @@ msgstr "Photos"
|
||||
msgid "Eboutic"
|
||||
msgstr "Eboutic"
|
||||
|
||||
#: core/templates/core/base.jinja:181
|
||||
#: core/templates/core/base.jinja:183
|
||||
msgid "Services"
|
||||
msgstr "Services"
|
||||
|
||||
#: core/templates/core/base.jinja:185
|
||||
#: core/templates/core/base.jinja:187
|
||||
msgid "Matmatronch"
|
||||
msgstr "Matmatronch"
|
||||
|
||||
#: core/templates/core/base.jinja:186 launderette/models.py:44
|
||||
#: core/templates/core/base.jinja:188 launderette/models.py:44
|
||||
#: launderette/templates/launderette/launderette_book.jinja:5
|
||||
#: launderette/templates/launderette/launderette_book_choose.jinja:4
|
||||
#: launderette/templates/launderette/launderette_main.jinja:4
|
||||
msgid "Launderette"
|
||||
msgstr "Laverie"
|
||||
|
||||
#: core/templates/core/base.jinja:187 core/templates/core/file.jinja:20
|
||||
#: core/templates/core/base.jinja:189 core/templates/core/file.jinja:20
|
||||
#: core/views/files.py:86
|
||||
msgid "Files"
|
||||
msgstr "Fichiers"
|
||||
|
||||
#: core/templates/core/base.jinja:188 core/templates/core/user_tools.jinja:108
|
||||
#: core/templates/core/base.jinja:190 core/templates/core/user_tools.jinja:108
|
||||
msgid "Pedagogy"
|
||||
msgstr "Pédagogie"
|
||||
|
||||
#: core/templates/core/base.jinja:192
|
||||
#: core/templates/core/base.jinja:194
|
||||
msgid "My Benefits"
|
||||
msgstr "Mes Avantages"
|
||||
|
||||
#: core/templates/core/base.jinja:196
|
||||
#: core/templates/core/base.jinja:198
|
||||
msgid "Sponsors"
|
||||
msgstr "Partenaires"
|
||||
|
||||
#: core/templates/core/base.jinja:197
|
||||
#: core/templates/core/base.jinja:199
|
||||
msgid "Subscriber benefits"
|
||||
msgstr "Les avantages cotisants"
|
||||
|
||||
#: core/templates/core/base.jinja:201
|
||||
#: core/templates/core/base.jinja:203
|
||||
msgid "Help"
|
||||
msgstr "Aide"
|
||||
|
||||
#: core/templates/core/base.jinja:205
|
||||
#: core/templates/core/base.jinja:207
|
||||
msgid "FAQ"
|
||||
msgstr "FAQ"
|
||||
|
||||
#: core/templates/core/base.jinja:206 core/templates/core/base.jinja:248
|
||||
#: core/templates/core/base.jinja:208 core/templates/core/base.jinja:250
|
||||
msgid "Contacts"
|
||||
msgstr "Contacts"
|
||||
|
||||
#: core/templates/core/base.jinja:207
|
||||
#: core/templates/core/base.jinja:209
|
||||
msgid "Wiki"
|
||||
msgstr "Wiki"
|
||||
|
||||
#: core/templates/core/base.jinja:249
|
||||
#: core/templates/core/base.jinja:251
|
||||
msgid "Legal notices"
|
||||
msgstr "Mentions légales"
|
||||
|
||||
#: core/templates/core/base.jinja:250
|
||||
#: core/templates/core/base.jinja:252
|
||||
msgid "Intellectual property"
|
||||
msgstr "Propriété intellectuelle"
|
||||
|
||||
#: core/templates/core/base.jinja:251
|
||||
#: core/templates/core/base.jinja:253
|
||||
msgid "Help & Documentation"
|
||||
msgstr "Aide & Documentation"
|
||||
|
||||
#: core/templates/core/base.jinja:252
|
||||
#: core/templates/core/base.jinja:254
|
||||
msgid "R&D"
|
||||
msgstr "R&D"
|
||||
|
||||
#: core/templates/core/base.jinja:254
|
||||
#: core/templates/core/base.jinja:256
|
||||
msgid "Site made by good people"
|
||||
msgstr "Site réalisé par des gens bons"
|
||||
|
||||
@ -2897,7 +2897,7 @@ msgid "You successfully changed your password!"
|
||||
msgstr "Vous avez correctement changé votre mot de passe !"
|
||||
|
||||
#: core/templates/core/password_reset.jinja:7
|
||||
#: core/templates/core/password_reset_confirm.jinja:7
|
||||
#: core/templates/core/password_reset_confirm.jinja:8
|
||||
msgid "Reset"
|
||||
msgstr "Reset"
|
||||
|
||||
@ -2905,6 +2905,16 @@ msgstr "Reset"
|
||||
msgid "You successfully reset your password!"
|
||||
msgstr "Vous avez correctement réinitialisé votre mot de passe !"
|
||||
|
||||
#: core/templates/core/password_reset_confirm.jinja:11
|
||||
msgid ""
|
||||
"It seems that this link has expired. To generate a new link, you can follow "
|
||||
"this link: "
|
||||
msgstr "Il semble que le lien ai expiré. Pour générer un nouveau lien, tu peux suivre ce lien : "
|
||||
|
||||
#: core/templates/core/password_reset_confirm.jinja:11
|
||||
msgid "lost password"
|
||||
msgstr "mot de passe perdu"
|
||||
|
||||
#: core/templates/core/password_reset_done.jinja:4
|
||||
msgid "Password reset sent"
|
||||
msgstr "Réinitialisation de mot de passe envoyée"
|
||||
@ -3038,7 +3048,7 @@ msgid "Eboutic invoices"
|
||||
msgstr "Facture eboutic"
|
||||
|
||||
#: core/templates/core/user_account.jinja:57
|
||||
#: core/templates/core/user_tools.jinja:36 counter/views.py:816
|
||||
#: core/templates/core/user_tools.jinja:36 counter/views.py:822
|
||||
msgid "Etickets"
|
||||
msgstr "Etickets"
|
||||
|
||||
@ -3370,8 +3380,8 @@ msgstr "Cotisations"
|
||||
msgid "Subscription stats"
|
||||
msgstr "Statistiques de cotisation"
|
||||
|
||||
#: core/templates/core/user_tools.jinja:28 counter/views.py:786
|
||||
#: counter/views.py:994
|
||||
#: core/templates/core/user_tools.jinja:28 counter/views.py:792
|
||||
#: counter/views.py:1000
|
||||
msgid "Counters"
|
||||
msgstr "Comptoirs"
|
||||
|
||||
@ -3388,12 +3398,12 @@ msgid "Product types management"
|
||||
msgstr "Gestion des types de produit"
|
||||
|
||||
#: core/templates/core/user_tools.jinja:34
|
||||
#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:806
|
||||
#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:812
|
||||
msgid "Cash register summaries"
|
||||
msgstr "Relevés de caisse"
|
||||
|
||||
#: core/templates/core/user_tools.jinja:35
|
||||
#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:811
|
||||
#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:817
|
||||
msgid "Invoices call"
|
||||
msgstr "Appels à facture"
|
||||
|
||||
@ -3914,7 +3924,7 @@ msgstr "Liste des relevés de caisse"
|
||||
msgid "Theoric sums"
|
||||
msgstr "Sommes théoriques"
|
||||
|
||||
#: counter/templates/counter/cash_summary_list.jinja:36 counter/views.py:1163
|
||||
#: counter/templates/counter/cash_summary_list.jinja:36 counter/views.py:1169
|
||||
msgid "Emptied"
|
||||
msgstr "Coffre vidé"
|
||||
|
||||
@ -4194,85 +4204,85 @@ msgstr "ANN"
|
||||
msgid "You have not enough money to buy all the basket"
|
||||
msgstr "Vous n'avez pas assez d'argent pour acheter le panier"
|
||||
|
||||
#: counter/views.py:780
|
||||
#: counter/views.py:786
|
||||
msgid "Counter administration"
|
||||
msgstr "Administration des comptoirs"
|
||||
|
||||
#: counter/views.py:782
|
||||
#: counter/views.py:788
|
||||
msgid "Stocks"
|
||||
msgstr "Stocks"
|
||||
|
||||
#: counter/views.py:791
|
||||
#: counter/views.py:797
|
||||
msgid "Products"
|
||||
msgstr "Produits"
|
||||
|
||||
#: counter/views.py:796
|
||||
#: counter/views.py:802
|
||||
msgid "Archived products"
|
||||
msgstr "Produits archivés"
|
||||
|
||||
#: counter/views.py:801
|
||||
#: counter/views.py:807
|
||||
msgid "Product types"
|
||||
msgstr "Types de produit"
|
||||
|
||||
#: counter/views.py:980
|
||||
#: counter/views.py:986
|
||||
msgid "Parent product"
|
||||
msgstr "Produit parent"
|
||||
|
||||
#: counter/views.py:986
|
||||
#: counter/views.py:992
|
||||
msgid "Buying groups"
|
||||
msgstr "Groupes d'achat"
|
||||
|
||||
#: counter/views.py:1120
|
||||
#: counter/views.py:1126
|
||||
msgid "10 cents"
|
||||
msgstr "10 centimes"
|
||||
|
||||
#: counter/views.py:1121
|
||||
#: counter/views.py:1127
|
||||
msgid "20 cents"
|
||||
msgstr "20 centimes"
|
||||
|
||||
#: counter/views.py:1122
|
||||
#: counter/views.py:1128
|
||||
msgid "50 cents"
|
||||
msgstr "50 centimes"
|
||||
|
||||
#: counter/views.py:1123
|
||||
#: counter/views.py:1129
|
||||
msgid "1 euro"
|
||||
msgstr "1 €"
|
||||
|
||||
#: counter/views.py:1124
|
||||
#: counter/views.py:1130
|
||||
msgid "2 euros"
|
||||
msgstr "2 €"
|
||||
|
||||
#: counter/views.py:1125
|
||||
#: counter/views.py:1131
|
||||
msgid "5 euros"
|
||||
msgstr "5 €"
|
||||
|
||||
#: counter/views.py:1126
|
||||
#: counter/views.py:1132
|
||||
msgid "10 euros"
|
||||
msgstr "10 €"
|
||||
|
||||
#: counter/views.py:1127
|
||||
#: counter/views.py:1133
|
||||
msgid "20 euros"
|
||||
msgstr "20 €"
|
||||
|
||||
#: counter/views.py:1128
|
||||
#: counter/views.py:1134
|
||||
msgid "50 euros"
|
||||
msgstr "50 €"
|
||||
|
||||
#: counter/views.py:1130
|
||||
#: counter/views.py:1136
|
||||
msgid "100 euros"
|
||||
msgstr "100 €"
|
||||
|
||||
#: counter/views.py:1133 counter/views.py:1139 counter/views.py:1145
|
||||
#: counter/views.py:1151 counter/views.py:1157
|
||||
#: counter/views.py:1139 counter/views.py:1145 counter/views.py:1151
|
||||
#: counter/views.py:1157 counter/views.py:1163
|
||||
msgid "Check amount"
|
||||
msgstr "Montant du chèque"
|
||||
|
||||
#: counter/views.py:1136 counter/views.py:1142 counter/views.py:1148
|
||||
#: counter/views.py:1154 counter/views.py:1160
|
||||
#: counter/views.py:1142 counter/views.py:1148 counter/views.py:1154
|
||||
#: counter/views.py:1160 counter/views.py:1166
|
||||
msgid "Check quantity"
|
||||
msgstr "Nombre de chèque"
|
||||
|
||||
#: counter/views.py:1796
|
||||
#: counter/views.py:1802
|
||||
msgid "people(s)"
|
||||
msgstr "personne(s)"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user