mirror of https://gitlab.crans.org/bde/nk20
Merge branch 'beta-soon' into 'master'
Beta soon See merge request bde/nk20!82
This commit is contained in:
ynerant
commit
8d704d0730
|
|
@ -8,8 +8,11 @@ DJANGO_DB_PASSWORD=CHANGE_ME
|
|||
DJANGO_DB_PORT=
|
||||
DJANGO_SECRET_KEY=CHANGE_ME
|
||||
DJANGO_SETTINGS_MODULE=note_kfet.settings
|
||||
DOMAIN=localhost
|
||||
CONTACT_EMAIL=tresorerie.bde@localhost
|
||||
NOTE_URL=localhost
|
||||
# Config for mails. Only used in production
|
||||
NOTE_MAIL=notekfet@localhost
|
||||
WEBMASTER_MAIL=notekfet@localhost
|
||||
EMAIL_HOST=smtp.localhost
|
||||
EMAIL_PORT=443
|
||||
EMAIL_USER=notekfet@localhost
|
||||
EMAIL_PASSWORD=CHANGE_ME
|
||||
|
|
|
|||
11
README.md
11
README.md
|
|
@ -117,9 +117,14 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n
|
|||
DJANGO_SETTINGS_MODULE="note_kfet.settings
|
||||
DOMAIN=localhost # note.example.com
|
||||
CONTACT_EMAIL=tresorerie.bde@localhost
|
||||
NOTE_URL=localhost # serveur cas note.example.com si auto-hébergé.
|
||||
NOTE_MAIL=notekfet@localhost # Adresse expéditrice des mails
|
||||
WEBMASTER_MAIL=notekfet@localhost # Adresse sur laquelle contacter les webmasters de la note
|
||||
NOTE_URL=localhost # URL où accéder à la note
|
||||
# Le reste n'est utile qu'en production, pour configurer l'envoi des mails
|
||||
NOTE_MAIL=notekfet@localhost
|
||||
EMAIL_HOST=smtp.localhost
|
||||
EMAIL_PORT=443
|
||||
EMAIL_USER=notekfet@localhost
|
||||
EMAIL_PASSWORD=CHANGE_ME
|
||||
|
||||
|
||||
Ensuite on (re)bascule dans l'environement virtuel et on lance les migrations
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,7 @@ class ActivityCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
|
|||
class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
|
||||
model = Activity
|
||||
table_class = ActivityTable
|
||||
|
||||
def get_queryset(self):
|
||||
return super().get_queryset().reverse()
|
||||
ordering = ('-date_start',)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
|
|
@ -47,7 +45,9 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
|
|||
|
||||
upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now())
|
||||
context['upcoming'] = ActivityTable(
|
||||
data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")))
|
||||
data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")),
|
||||
prefix='upcoming-',
|
||||
)
|
||||
|
||||
return context
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db import models
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
|
|
@ -273,7 +273,8 @@ class SpecialTransaction(Transaction):
|
|||
def clean(self):
|
||||
# SpecialTransaction are only possible with NoteSpecial object
|
||||
if self.is_credit() == self.is_debit():
|
||||
raise(ValidationError(_("A special transaction is only possible between a Note associated to a payment method and a User or a Club")))
|
||||
raise(ValidationError(_("A special transaction is only possible between a"
|
||||
" Note associated to a payment method and a User or a Club")))
|
||||
|
||||
|
||||
class MembershipTransaction(Transaction):
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
import datetime
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.backends import ModelBackend
|
||||
from django.contrib.auth.models import User, AnonymousUser
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db.models import Q, F
|
||||
from note.models import Note, NoteUser, NoteClub, NoteSpecial
|
||||
from note_kfet import settings
|
||||
from note_kfet.middlewares import get_current_session
|
||||
from member.models import Membership, Club
|
||||
|
||||
|
|
@ -37,16 +37,27 @@ class PermissionBackend(ModelBackend):
|
|||
# Unauthenticated users have no permissions
|
||||
return Permission.objects.none()
|
||||
|
||||
return Permission.objects.annotate(
|
||||
qs = Permission.objects.annotate(
|
||||
club=F("rolepermissions__role__membership__club"),
|
||||
membership=F("rolepermissions__role__membership"),
|
||||
).filter(
|
||||
rolepermissions__role__membership__user=user,
|
||||
rolepermissions__role__membership__date_start__lte=datetime.date.today(),
|
||||
rolepermissions__role__membership__date_end__gte=datetime.date.today(),
|
||||
type=t,
|
||||
mask__rank__lte=get_current_session().get("permission_mask", 0),
|
||||
).distinct()
|
||||
(
|
||||
Q(
|
||||
rolepermissions__role__membership__date_start__lte=datetime.date.today(),
|
||||
rolepermissions__role__membership__date_end__gte=datetime.date.today(),
|
||||
)
|
||||
| Q(permanent=True)
|
||||
)
|
||||
& Q(rolepermissions__role__membership__user=user)
|
||||
& Q(type=t)
|
||||
& Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
|
||||
)
|
||||
|
||||
if settings.DATABASES[qs.db]["ENGINE"] == 'django.db.backends.postgresql_psycopg2':
|
||||
qs = qs.distinct('pk', 'club')
|
||||
else: # SQLite doesn't support distinct fields.
|
||||
qs = qs.distinct()
|
||||
return qs
|
||||
|
||||
@staticmethod
|
||||
def permissions(user, model, type):
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -170,6 +170,12 @@ class Permission(models.Model):
|
|||
verbose_name=_("field"),
|
||||
)
|
||||
|
||||
permanent = models.BooleanField(
|
||||
default=False,
|
||||
help_text=_("Tells if the permission should be granted even if the membership of the user is expired."),
|
||||
verbose_name=_("permanent"),
|
||||
)
|
||||
|
||||
description = models.CharField(
|
||||
max_length=255,
|
||||
blank=True,
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ class ProtectQuerysetMixin:
|
|||
"""
|
||||
def get_queryset(self, **kwargs):
|
||||
qs = super().get_queryset(**kwargs)
|
||||
return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view"))
|
||||
return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")).distinct()
|
||||
|
||||
def get_form(self, form_class=None):
|
||||
form = super().get_form(form_class)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 985f7c7bcd652edfba321977252b36f3ac93a61b
|
||||
Subproject commit ee54fca89ee247a4ba4af080dd3036d92340eade
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
from django.core.management import BaseCommand, CommandError
|
||||
from django.db.models import Q
|
||||
from django.db.models.functions import Lower
|
||||
|
||||
from wei.models import WEIClub, Bus, BusTeam, WEIMembership
|
||||
|
||||
|
||||
|
|
@ -65,7 +64,7 @@ class Command(BaseCommand):
|
|||
|
||||
if team is not None:
|
||||
qs = qs.filter(team=team if team else None)
|
||||
|
||||
|
||||
sep = options["sep"]
|
||||
|
||||
self.stdout.write("Nom|Prénom|Date de naissance|Genre|Département|Année|Section|Bus|Équipe|Rôles"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-04-27 03:55+0200\n"
|
||||
"POT-Creation-Date: 2020-05-07 20:56+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -46,8 +46,8 @@ msgstr ""
|
|||
#: apps/activity/models.py:23 apps/activity/models.py:48
|
||||
#: apps/member/models.py:151 apps/member/models.py:255
|
||||
#: apps/note/models/notes.py:188 apps/note/models/transactions.py:25
|
||||
#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:250
|
||||
#: apps/wei/models.py:62 templates/member/club_info.html:13
|
||||
#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:249
|
||||
#: apps/wei/models.py:64 templates/member/club_info.html:13
|
||||
#: templates/member/profile_info.html:14
|
||||
#: templates/registration/future_profile_detail.html:16
|
||||
#: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18
|
||||
|
|
@ -71,8 +71,8 @@ msgid "activity types"
|
|||
msgstr ""
|
||||
|
||||
#: apps/activity/models.py:53 apps/note/models/transactions.py:75
|
||||
#: apps/permission/models.py:103 apps/permission/models.py:176
|
||||
#: apps/wei/models.py:68 apps/wei/models.py:124
|
||||
#: apps/permission/models.py:103 apps/permission/models.py:182
|
||||
#: apps/wei/models.py:70 apps/wei/models.py:126
|
||||
#: templates/activity/activity_detail.html:16
|
||||
msgid "description"
|
||||
msgstr ""
|
||||
|
|
@ -85,7 +85,7 @@ msgstr ""
|
|||
|
||||
#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:277
|
||||
#: apps/note/models/notes.py:117 apps/treasury/models.py:221
|
||||
#: apps/wei/models.py:155 templates/treasury/sogecredit_detail.html:14
|
||||
#: apps/wei/models.py:157 templates/treasury/sogecredit_detail.html:14
|
||||
#: templates/wei/survey.html:16
|
||||
msgid "user"
|
||||
msgstr ""
|
||||
|
|
@ -193,7 +193,7 @@ msgstr ""
|
|||
|
||||
#: apps/activity/tables.py:79 apps/member/forms.py:88
|
||||
#: apps/registration/forms.py:69 apps/treasury/forms.py:123
|
||||
#: templates/note/transaction_form.html:97
|
||||
#: templates/note/transaction_form.html:126
|
||||
msgid "First name"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -205,11 +205,11 @@ msgstr ""
|
|||
msgid "Balance"
|
||||
msgstr ""
|
||||
|
||||
#: apps/activity/views.py:46 templates/base.html:121
|
||||
#: apps/activity/views.py:46 templates/base.html:120
|
||||
msgid "Activities"
|
||||
msgstr ""
|
||||
|
||||
#: apps/activity/views.py:153
|
||||
#: apps/activity/views.py:160
|
||||
msgid "Entry for activity \"{}\""
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -250,7 +250,7 @@ msgstr ""
|
|||
msgid "edit"
|
||||
msgstr ""
|
||||
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:149
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:150
|
||||
#: apps/wei/tables.py:65
|
||||
msgid "delete"
|
||||
msgstr ""
|
||||
|
|
@ -304,18 +304,18 @@ msgid "Credit amount"
|
|||
msgstr ""
|
||||
|
||||
#: apps/member/forms.py:93 apps/registration/forms.py:74
|
||||
#: apps/treasury/forms.py:125 templates/note/transaction_form.html:103
|
||||
#: apps/treasury/forms.py:125 templates/note/transaction_form.html:132
|
||||
msgid "Bank"
|
||||
msgstr ""
|
||||
|
||||
#: apps/member/models.py:34
|
||||
#: templates/registration/future_profile_detail.html:47
|
||||
#: templates/registration/future_profile_detail.html:40
|
||||
#: templates/wei/weimembership_form.html:48
|
||||
msgid "phone number"
|
||||
msgstr ""
|
||||
|
||||
#: apps/member/models.py:41 templates/member/profile_info.html:27
|
||||
#: templates/registration/future_profile_detail.html:41
|
||||
#: apps/member/models.py:41 templates/member/profile_info.html:29
|
||||
#: templates/registration/future_profile_detail.html:34
|
||||
#: templates/wei/weimembership_form.html:42
|
||||
msgid "section"
|
||||
msgstr ""
|
||||
|
|
@ -400,14 +400,14 @@ msgstr ""
|
|||
msgid "Year of entry to the school (None if not ENS student)"
|
||||
msgstr ""
|
||||
|
||||
#: apps/member/models.py:79 templates/member/profile_info.html:30
|
||||
#: templates/registration/future_profile_detail.html:44
|
||||
#: apps/member/models.py:79 templates/member/profile_info.html:32
|
||||
#: templates/registration/future_profile_detail.html:37
|
||||
#: templates/wei/weimembership_form.html:45
|
||||
msgid "address"
|
||||
msgstr ""
|
||||
|
||||
#: apps/member/models.py:86
|
||||
#: templates/registration/future_profile_detail.html:50
|
||||
#: templates/registration/future_profile_detail.html:43
|
||||
#: templates/wei/weimembership_form.html:51
|
||||
msgid "paid"
|
||||
msgstr ""
|
||||
|
|
@ -489,7 +489,7 @@ msgstr ""
|
|||
msgid "clubs"
|
||||
msgstr ""
|
||||
|
||||
#: apps/member/models.py:261 apps/permission/models.py:312
|
||||
#: apps/member/models.py:261 apps/permission/models.py:318
|
||||
msgid "role"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -538,9 +538,9 @@ msgstr ""
|
|||
msgid "This address must be valid."
|
||||
msgstr ""
|
||||
|
||||
#: apps/member/views.py:65 templates/member/profile_info.html:45
|
||||
#: templates/registration/future_profile_detail.html:55
|
||||
#: templates/wei/weimembership_form.html:122
|
||||
#: apps/member/views.py:65 templates/member/profile_info.html:47
|
||||
#: templates/registration/future_profile_detail.html:48
|
||||
#: templates/wei/weimembership_form.html:124
|
||||
msgid "Update Profile"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -674,7 +674,7 @@ msgid "alias"
|
|||
msgstr ""
|
||||
|
||||
#: apps/note/models/notes.py:211 templates/member/club_info.html:54
|
||||
#: templates/member/profile_info.html:36 templates/wei/weiclub_info.html:48
|
||||
#: templates/member/profile_info.html:38 templates/wei/weiclub_info.html:48
|
||||
msgid "aliases"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -749,39 +749,39 @@ msgid "transactions"
|
|||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:216
|
||||
#: templates/activity/activity_entry.html:13 templates/base.html:84
|
||||
#: templates/activity/activity_entry.html:13 templates/base.html:98
|
||||
#: templates/note/transaction_form.html:19
|
||||
#: templates/note/transaction_form.html:140
|
||||
msgid "Transfer"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:240
|
||||
#: apps/note/models/transactions.py:239
|
||||
msgid "Template"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:255
|
||||
#: apps/note/models/transactions.py:254
|
||||
msgid "first_name"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:260
|
||||
#: apps/note/models/transactions.py:259
|
||||
msgid "bank"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:266
|
||||
#: apps/note/models/transactions.py:265
|
||||
#: templates/activity/activity_entry.html:17
|
||||
#: templates/note/transaction_form.html:24
|
||||
msgid "Credit"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:266 templates/note/transaction_form.html:28
|
||||
#: apps/note/models/transactions.py:265 templates/note/transaction_form.html:28
|
||||
msgid "Debit"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:282 apps/note/models/transactions.py:287
|
||||
#: apps/note/models/transactions.py:281 apps/note/models/transactions.py:286
|
||||
msgid "membership transaction"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/models/transactions.py:283 apps/treasury/models.py:227
|
||||
#: apps/note/models/transactions.py:282 apps/treasury/models.py:227
|
||||
msgid "membership transactions"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -797,14 +797,14 @@ msgstr ""
|
|||
msgid "No reason specified"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/tables.py:122 apps/note/tables.py:151 apps/wei/tables.py:66
|
||||
#: apps/note/tables.py:122 apps/note/tables.py:152 apps/wei/tables.py:66
|
||||
#: templates/treasury/sogecredit_detail.html:59
|
||||
#: templates/wei/weiregistration_confirm_delete.html:32
|
||||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/tables.py:146 apps/wei/tables.py:42 apps/wei/tables.py:43
|
||||
#: templates/member/club_info.html:67 templates/note/conso_form.html:121
|
||||
#: apps/note/tables.py:147 apps/wei/tables.py:42 apps/wei/tables.py:43
|
||||
#: templates/member/club_info.html:67 templates/note/conso_form.html:128
|
||||
#: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
|
||||
#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68
|
||||
msgid "Edit"
|
||||
|
|
@ -814,7 +814,7 @@ msgstr ""
|
|||
msgid "Transfer money"
|
||||
msgstr ""
|
||||
|
||||
#: apps/note/views.py:137 templates/base.html:94
|
||||
#: apps/note/views.py:137 templates/base.html:93
|
||||
msgid "Consumptions"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -852,19 +852,29 @@ msgstr ""
|
|||
msgid "field"
|
||||
msgstr ""
|
||||
|
||||
#: apps/permission/models.py:181
|
||||
msgid "permission"
|
||||
#: apps/permission/models.py:175
|
||||
msgid ""
|
||||
"Tells if the permission should be granted even if the membership of the user "
|
||||
"is expired."
|
||||
msgstr ""
|
||||
|
||||
#: apps/permission/models.py:182 apps/permission/models.py:316
|
||||
msgid "permissions"
|
||||
#: apps/permission/models.py:176 templates/permission/all_rights.html:26
|
||||
msgid "permanent"
|
||||
msgstr ""
|
||||
|
||||
#: apps/permission/models.py:187
|
||||
msgid "permission"
|
||||
msgstr ""
|
||||
|
||||
#: apps/permission/models.py:188 apps/permission/models.py:322
|
||||
msgid "permissions"
|
||||
msgstr ""
|
||||
|
||||
#: apps/permission/models.py:193
|
||||
msgid "Specifying field applies only to view and change permission types."
|
||||
msgstr ""
|
||||
|
||||
#: apps/permission/models.py:323 apps/permission/models.py:324
|
||||
#: apps/permission/models.py:329 apps/permission/models.py:330
|
||||
msgid "role permissions"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -944,14 +954,16 @@ msgid ""
|
|||
"The entered amount is not enough for the memberships, should be at least {}"
|
||||
msgstr ""
|
||||
|
||||
#: apps/treasury/apps.py:12 templates/base.html:126
|
||||
#: apps/treasury/apps.py:12 templates/base.html:125
|
||||
msgid "Treasury"
|
||||
msgstr ""
|
||||
|
||||
#: apps/treasury/forms.py:85 apps/treasury/forms.py:133
|
||||
#: templates/activity/activity_form.html:9
|
||||
#: templates/activity/activity_invite.html:8
|
||||
#: templates/django_filters/rest_framework/form.html:5
|
||||
#: templates/member/add_members.html:14 templates/member/club_form.html:9
|
||||
#: templates/note/transactiontemplate_form.html:15
|
||||
#: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13
|
||||
#: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15
|
||||
#: templates/wei/weiregistration_form.html:14
|
||||
|
|
@ -971,7 +983,7 @@ msgid "You can't change the type of the remittance."
|
|||
msgstr ""
|
||||
|
||||
#: apps/treasury/forms.py:127 apps/treasury/tables.py:47
|
||||
#: apps/treasury/tables.py:113 templates/note/transaction_form.html:133
|
||||
#: apps/treasury/tables.py:113 templates/note/transaction_form.html:95
|
||||
#: templates/treasury/remittance_form.html:18
|
||||
msgid "Amount"
|
||||
msgstr ""
|
||||
|
|
@ -992,7 +1004,7 @@ msgstr ""
|
|||
msgid "Description"
|
||||
msgstr ""
|
||||
|
||||
#: apps/treasury/models.py:48 templates/note/transaction_form.html:91
|
||||
#: apps/treasury/models.py:48 templates/note/transaction_form.html:120
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1139,13 +1151,13 @@ msgstr ""
|
|||
msgid "No"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/apps.py:10 apps/wei/models.py:45 apps/wei/models.py:46
|
||||
#: apps/wei/models.py:57 apps/wei/models.py:162 templates/base.html:116
|
||||
#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
|
||||
#: apps/wei/models.py:59 apps/wei/models.py:164 templates/base.html:130
|
||||
msgid "WEI"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/forms/registration.py:47 apps/wei/models.py:109
|
||||
#: apps/wei/models.py:271
|
||||
#: apps/wei/forms/registration.py:47 apps/wei/models.py:111
|
||||
#: apps/wei/models.py:273
|
||||
msgid "bus"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1166,7 +1178,7 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#: apps/wei/forms/registration.py:61 apps/wei/forms/registration.py:67
|
||||
#: apps/wei/models.py:143
|
||||
#: apps/wei/models.py:145
|
||||
msgid "WEI Roles"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1178,151 +1190,151 @@ msgstr ""
|
|||
msgid "This team doesn't belong to the given bus."
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:20 templates/wei/weiclub_info.html:23
|
||||
#: apps/wei/models.py:22 templates/wei/weiclub_info.html:23
|
||||
msgid "year"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:24 templates/wei/weiclub_info.html:17
|
||||
#: apps/wei/models.py:26 templates/wei/weiclub_info.html:17
|
||||
msgid "date start"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:28 templates/wei/weiclub_info.html:20
|
||||
#: apps/wei/models.py:30 templates/wei/weiclub_info.html:20
|
||||
msgid "date end"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:73
|
||||
#: apps/wei/models.py:75
|
||||
msgid "survey information"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:74
|
||||
#: apps/wei/models.py:76
|
||||
msgid "Information about the survey for new members, encoded in JSON"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:96
|
||||
#: apps/wei/models.py:98
|
||||
msgid "Bus"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:97 templates/wei/weiclub_tables.html:79
|
||||
#: apps/wei/models.py:99 templates/wei/weiclub_tables.html:79
|
||||
msgid "Buses"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:117
|
||||
#: apps/wei/models.py:119
|
||||
msgid "color"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:118
|
||||
#: apps/wei/models.py:120
|
||||
msgid "The color of the T-Shirt, stored with its number equivalent"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:132
|
||||
#: apps/wei/models.py:134
|
||||
msgid "Bus team"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:133
|
||||
#: apps/wei/models.py:135
|
||||
msgid "Bus teams"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:142
|
||||
#: apps/wei/models.py:144
|
||||
msgid "WEI Role"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:167
|
||||
#: apps/wei/models.py:169
|
||||
msgid "Credit from Société générale"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:172
|
||||
#: apps/wei/models.py:174
|
||||
msgid "Caution check given"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:176 templates/wei/weimembership_form.html:62
|
||||
#: apps/wei/models.py:178 templates/wei/weimembership_form.html:62
|
||||
msgid "birth date"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:182
|
||||
#: apps/wei/models.py:184
|
||||
msgid "Male"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:183
|
||||
#: apps/wei/models.py:185
|
||||
msgid "Female"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:184
|
||||
#: apps/wei/models.py:186
|
||||
msgid "Non binary"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:186 templates/wei/weimembership_form.html:59
|
||||
#: apps/wei/models.py:188 templates/wei/weimembership_form.html:59
|
||||
msgid "gender"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:192 templates/wei/weimembership_form.html:65
|
||||
#: apps/wei/models.py:194 templates/wei/weimembership_form.html:65
|
||||
msgid "health issues"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:197 templates/wei/weimembership_form.html:68
|
||||
#: apps/wei/models.py:199 templates/wei/weimembership_form.html:68
|
||||
msgid "emergency contact name"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:202 templates/wei/weimembership_form.html:71
|
||||
#: apps/wei/models.py:204 templates/wei/weimembership_form.html:71
|
||||
msgid "emergency contact phone"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:207 templates/wei/weimembership_form.html:74
|
||||
#: apps/wei/models.py:209 templates/wei/weimembership_form.html:74
|
||||
msgid ""
|
||||
"Register on the mailing list to stay informed of the events of the campus (1 "
|
||||
"mail/week)"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:212 templates/wei/weimembership_form.html:77
|
||||
#: apps/wei/models.py:214 templates/wei/weimembership_form.html:77
|
||||
msgid ""
|
||||
"Register on the mailing list to stay informed of the sport events of the "
|
||||
"campus (1 mail/week)"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:217 templates/wei/weimembership_form.html:80
|
||||
#: apps/wei/models.py:219 templates/wei/weimembership_form.html:80
|
||||
msgid ""
|
||||
"Register on the mailing list to stay informed of the art events of the "
|
||||
"campus (1 mail/week)"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:222 templates/wei/weimembership_form.html:56
|
||||
#: apps/wei/models.py:224 templates/wei/weimembership_form.html:56
|
||||
msgid "first year"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:223
|
||||
#: apps/wei/models.py:225
|
||||
msgid "Tells if the user is new in the school."
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:228
|
||||
#: apps/wei/models.py:230
|
||||
msgid "registration information"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:229
|
||||
#: apps/wei/models.py:231
|
||||
msgid ""
|
||||
"Information about the registration (buses for old members, survey fot the "
|
||||
"new members), encoded in JSON"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:260
|
||||
#: apps/wei/models.py:262
|
||||
msgid "WEI User"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:261
|
||||
#: apps/wei/models.py:263
|
||||
msgid "WEI Users"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:281
|
||||
#: apps/wei/models.py:283
|
||||
msgid "team"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:291
|
||||
#: apps/wei/models.py:293
|
||||
msgid "WEI registration"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:295
|
||||
#: apps/wei/models.py:297
|
||||
msgid "WEI membership"
|
||||
msgstr ""
|
||||
|
||||
#: apps/wei/models.py:296
|
||||
#: apps/wei/models.py:298
|
||||
msgid "WEI memberships"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1509,23 +1521,27 @@ msgstr ""
|
|||
msgid "The ENS Paris-Saclay BDE note."
|
||||
msgstr ""
|
||||
|
||||
#: templates/base.html:104
|
||||
#: templates/base.html:103
|
||||
msgid "Users"
|
||||
msgstr ""
|
||||
|
||||
#: templates/base.html:109
|
||||
#: templates/base.html:108
|
||||
msgid "Clubs"
|
||||
msgstr ""
|
||||
|
||||
#: templates/base.html:115
|
||||
#: templates/base.html:114
|
||||
msgid "Registrations"
|
||||
msgstr ""
|
||||
|
||||
#: templates/base.html:120
|
||||
#: templates/base.html:134
|
||||
msgid "Rights"
|
||||
msgstr ""
|
||||
|
||||
#: templates/base.html:158
|
||||
#: templates/base.html:138
|
||||
msgid "Administration"
|
||||
msgstr ""
|
||||
|
||||
#: templates/base.html:177
|
||||
msgid ""
|
||||
"Your e-mail address is not validated. Please check your mail inbox and click "
|
||||
"on the validation link."
|
||||
|
|
@ -1543,6 +1559,11 @@ msgid ""
|
|||
"upgrading."
|
||||
msgstr ""
|
||||
|
||||
#: templates/django_filters/rest_framework/crispy_form.html:4
|
||||
#: templates/django_filters/rest_framework/form.html:2
|
||||
msgid "Field filters"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/alias_update.html:5
|
||||
msgid "Add alias"
|
||||
msgstr ""
|
||||
|
|
@ -1559,7 +1580,7 @@ msgstr ""
|
|||
msgid "membership fee"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/club_info.html:50 templates/member/profile_info.html:33
|
||||
#: templates/member/club_info.html:50 templates/member/profile_info.html:35
|
||||
#: templates/treasury/sogecredit_detail.html:18
|
||||
#: templates/wei/weiclub_info.html:43
|
||||
msgid "balance"
|
||||
|
|
@ -1569,7 +1590,7 @@ msgstr ""
|
|||
msgid "Add member"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/club_info.html:71 templates/member/profile_info.html:48
|
||||
#: templates/member/club_info.html:71 templates/member/profile_info.html:50
|
||||
msgid "View Profile"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1617,17 +1638,15 @@ msgstr ""
|
|||
msgid "username"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/profile_info.html:20
|
||||
#: templates/registration/future_profile_detail.html:34
|
||||
#: templates/member/profile_info.html:21
|
||||
msgid "password"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/profile_info.html:23
|
||||
#: templates/registration/future_profile_detail.html:37
|
||||
#: templates/member/profile_info.html:24
|
||||
msgid "Change password"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/profile_info.html:41
|
||||
#: templates/member/profile_info.html:43
|
||||
msgid "Manage auth token"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1792,18 +1811,18 @@ msgid ""
|
|||
"activate your account."
|
||||
msgstr ""
|
||||
|
||||
#: templates/registration/future_profile_detail.html:56
|
||||
#: templates/registration/future_profile_detail.html:49
|
||||
#: templates/wei/weiregistration_confirm_delete.html:12
|
||||
msgid "Delete registration"
|
||||
msgstr ""
|
||||
|
||||
#: templates/registration/future_profile_detail.html:64
|
||||
#: templates/registration/future_profile_detail.html:57
|
||||
msgid "Validate account"
|
||||
msgstr ""
|
||||
|
||||
#: templates/registration/future_profile_detail.html:71
|
||||
#: templates/wei/weimembership_form.html:132
|
||||
#: templates/wei/weimembership_form.html:190
|
||||
#: templates/registration/future_profile_detail.html:64
|
||||
#: templates/wei/weimembership_form.html:134
|
||||
#: templates/wei/weimembership_form.html:192
|
||||
msgid "Validate registration"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2184,32 +2203,32 @@ msgstr ""
|
|||
msgid "preferred roles"
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:123
|
||||
#: templates/wei/weimembership_form.html:122
|
||||
#: templates/wei/weiregistration_confirm_delete.html:31
|
||||
msgid "Update registration"
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:136
|
||||
#: templates/wei/weimembership_form.html:138
|
||||
msgid "The registration is already validated and can't be unvalidated."
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:137
|
||||
#: templates/wei/weimembership_form.html:139
|
||||
msgid "The user joined the bus"
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:138
|
||||
#: templates/wei/weimembership_form.html:140
|
||||
msgid "in the team"
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:139
|
||||
#: templates/wei/weimembership_form.html:141
|
||||
msgid "in no team (staff)"
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:139
|
||||
#: templates/wei/weimembership_form.html:141
|
||||
msgid "with the following roles:"
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:144
|
||||
#: templates/wei/weimembership_form.html:146
|
||||
msgid ""
|
||||
"\n"
|
||||
" The WEI will be paid by Société générale. The "
|
||||
|
|
@ -2221,7 +2240,7 @@ msgid ""
|
|||
" "
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:154
|
||||
#: templates/wei/weimembership_form.html:156
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
@ -2230,15 +2249,15 @@ msgid ""
|
|||
" "
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:161
|
||||
#: templates/wei/weimembership_form.html:163
|
||||
msgid "The note has enough money, the registration is possible."
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:168
|
||||
#: templates/wei/weimembership_form.html:170
|
||||
msgid "The user didn't give her/his caution check."
|
||||
msgstr ""
|
||||
|
||||
#: templates/wei/weimembership_form.html:176
|
||||
#: templates/wei/weimembership_form.html:178
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-04-27 03:55+0200\n"
|
||||
"POT-Creation-Date: 2020-05-07 20:56+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -47,8 +47,8 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
|
|||
#: apps/activity/models.py:23 apps/activity/models.py:48
|
||||
#: apps/member/models.py:151 apps/member/models.py:255
|
||||
#: apps/note/models/notes.py:188 apps/note/models/transactions.py:25
|
||||
#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:250
|
||||
#: apps/wei/models.py:62 templates/member/club_info.html:13
|
||||
#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:249
|
||||
#: apps/wei/models.py:64 templates/member/club_info.html:13
|
||||
#: templates/member/profile_info.html:14
|
||||
#: templates/registration/future_profile_detail.html:16
|
||||
#: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18
|
||||
|
|
@ -72,8 +72,8 @@ msgid "activity types"
|
|||
msgstr "types d'activité"
|
||||
|
||||
#: apps/activity/models.py:53 apps/note/models/transactions.py:75
|
||||
#: apps/permission/models.py:103 apps/permission/models.py:176
|
||||
#: apps/wei/models.py:68 apps/wei/models.py:124
|
||||
#: apps/permission/models.py:103 apps/permission/models.py:182
|
||||
#: apps/wei/models.py:70 apps/wei/models.py:126
|
||||
#: templates/activity/activity_detail.html:16
|
||||
msgid "description"
|
||||
msgstr "description"
|
||||
|
|
@ -86,7 +86,7 @@ msgstr "type"
|
|||
|
||||
#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:277
|
||||
#: apps/note/models/notes.py:117 apps/treasury/models.py:221
|
||||
#: apps/wei/models.py:155 templates/treasury/sogecredit_detail.html:14
|
||||
#: apps/wei/models.py:157 templates/treasury/sogecredit_detail.html:14
|
||||
#: templates/wei/survey.html:16
|
||||
msgid "user"
|
||||
msgstr "utilisateur"
|
||||
|
|
@ -194,7 +194,7 @@ msgstr "Nom de famille"
|
|||
|
||||
#: apps/activity/tables.py:79 apps/member/forms.py:88
|
||||
#: apps/registration/forms.py:69 apps/treasury/forms.py:123
|
||||
#: templates/note/transaction_form.html:97
|
||||
#: templates/note/transaction_form.html:126
|
||||
msgid "First name"
|
||||
msgstr "Prénom"
|
||||
|
||||
|
|
@ -206,11 +206,11 @@ msgstr "Note"
|
|||
msgid "Balance"
|
||||
msgstr "Solde du compte"
|
||||
|
||||
#: apps/activity/views.py:46 templates/base.html:121
|
||||
#: apps/activity/views.py:46 templates/base.html:120
|
||||
msgid "Activities"
|
||||
msgstr "Activités"
|
||||
|
||||
#: apps/activity/views.py:153
|
||||
#: apps/activity/views.py:160
|
||||
msgid "Entry for activity \"{}\""
|
||||
msgstr "Entrées pour l'activité « {} »"
|
||||
|
||||
|
|
@ -251,7 +251,7 @@ msgstr "Créer"
|
|||
msgid "edit"
|
||||
msgstr "Modifier"
|
||||
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:149
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:150
|
||||
#: apps/wei/tables.py:65
|
||||
msgid "delete"
|
||||
msgstr "Supprimer"
|
||||
|
|
@ -305,18 +305,18 @@ msgid "Credit amount"
|
|||
msgstr "Montant à créditer"
|
||||
|
||||
#: apps/member/forms.py:93 apps/registration/forms.py:74
|
||||
#: apps/treasury/forms.py:125 templates/note/transaction_form.html:103
|
||||
#: apps/treasury/forms.py:125 templates/note/transaction_form.html:132
|
||||
msgid "Bank"
|
||||
msgstr "Banque"
|
||||
|
||||
#: apps/member/models.py:34
|
||||
#: templates/registration/future_profile_detail.html:47
|
||||
#: templates/registration/future_profile_detail.html:40
|
||||
#: templates/wei/weimembership_form.html:48
|
||||
msgid "phone number"
|
||||
msgstr "numéro de téléphone"
|
||||
|
||||
#: apps/member/models.py:41 templates/member/profile_info.html:27
|
||||
#: templates/registration/future_profile_detail.html:41
|
||||
#: apps/member/models.py:41 templates/member/profile_info.html:29
|
||||
#: templates/registration/future_profile_detail.html:34
|
||||
#: templates/wei/weimembership_form.html:42
|
||||
msgid "section"
|
||||
msgstr "section"
|
||||
|
|
@ -401,14 +401,14 @@ msgstr "promotion"
|
|||
msgid "Year of entry to the school (None if not ENS student)"
|
||||
msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)"
|
||||
|
||||
#: apps/member/models.py:79 templates/member/profile_info.html:30
|
||||
#: templates/registration/future_profile_detail.html:44
|
||||
#: apps/member/models.py:79 templates/member/profile_info.html:32
|
||||
#: templates/registration/future_profile_detail.html:37
|
||||
#: templates/wei/weimembership_form.html:45
|
||||
msgid "address"
|
||||
msgstr "adresse"
|
||||
|
||||
#: apps/member/models.py:86
|
||||
#: templates/registration/future_profile_detail.html:50
|
||||
#: templates/registration/future_profile_detail.html:43
|
||||
#: templates/wei/weimembership_form.html:51
|
||||
msgid "paid"
|
||||
msgstr "payé"
|
||||
|
|
@ -494,7 +494,7 @@ msgstr "club"
|
|||
msgid "clubs"
|
||||
msgstr "clubs"
|
||||
|
||||
#: apps/member/models.py:261 apps/permission/models.py:312
|
||||
#: apps/member/models.py:261 apps/permission/models.py:318
|
||||
msgid "role"
|
||||
msgstr "rôle"
|
||||
|
||||
|
|
@ -543,9 +543,9 @@ msgstr "Renouveler"
|
|||
msgid "This address must be valid."
|
||||
msgstr "Cette adresse doit être valide."
|
||||
|
||||
#: apps/member/views.py:65 templates/member/profile_info.html:45
|
||||
#: templates/registration/future_profile_detail.html:55
|
||||
#: templates/wei/weimembership_form.html:122
|
||||
#: apps/member/views.py:65 templates/member/profile_info.html:47
|
||||
#: templates/registration/future_profile_detail.html:48
|
||||
#: templates/wei/weimembership_form.html:124
|
||||
msgid "Update Profile"
|
||||
msgstr "Modifier le profil"
|
||||
|
||||
|
|
@ -682,7 +682,7 @@ msgid "alias"
|
|||
msgstr "alias"
|
||||
|
||||
#: apps/note/models/notes.py:211 templates/member/club_info.html:54
|
||||
#: templates/member/profile_info.html:36 templates/wei/weiclub_info.html:48
|
||||
#: templates/member/profile_info.html:38 templates/wei/weiclub_info.html:48
|
||||
msgid "aliases"
|
||||
msgstr "alias"
|
||||
|
||||
|
|
@ -757,39 +757,39 @@ msgid "transactions"
|
|||
msgstr "transactions"
|
||||
|
||||
#: apps/note/models/transactions.py:216
|
||||
#: templates/activity/activity_entry.html:13 templates/base.html:84
|
||||
#: templates/activity/activity_entry.html:13 templates/base.html:98
|
||||
#: templates/note/transaction_form.html:19
|
||||
#: templates/note/transaction_form.html:140
|
||||
msgid "Transfer"
|
||||
msgstr "Virement"
|
||||
|
||||
#: apps/note/models/transactions.py:240
|
||||
#: apps/note/models/transactions.py:239
|
||||
msgid "Template"
|
||||
msgstr "Bouton"
|
||||
|
||||
#: apps/note/models/transactions.py:255
|
||||
#: apps/note/models/transactions.py:254
|
||||
msgid "first_name"
|
||||
msgstr "prénom"
|
||||
|
||||
#: apps/note/models/transactions.py:260
|
||||
#: apps/note/models/transactions.py:259
|
||||
msgid "bank"
|
||||
msgstr "banque"
|
||||
|
||||
#: apps/note/models/transactions.py:266
|
||||
#: apps/note/models/transactions.py:265
|
||||
#: templates/activity/activity_entry.html:17
|
||||
#: templates/note/transaction_form.html:24
|
||||
msgid "Credit"
|
||||
msgstr "Crédit"
|
||||
|
||||
#: apps/note/models/transactions.py:266 templates/note/transaction_form.html:28
|
||||
#: apps/note/models/transactions.py:265 templates/note/transaction_form.html:28
|
||||
msgid "Debit"
|
||||
msgstr "Débit"
|
||||
|
||||
#: apps/note/models/transactions.py:282 apps/note/models/transactions.py:287
|
||||
#: apps/note/models/transactions.py:281 apps/note/models/transactions.py:286
|
||||
msgid "membership transaction"
|
||||
msgstr "Transaction d'adhésion"
|
||||
|
||||
#: apps/note/models/transactions.py:283 apps/treasury/models.py:227
|
||||
#: apps/note/models/transactions.py:282 apps/treasury/models.py:227
|
||||
msgid "membership transactions"
|
||||
msgstr "Transactions d'adhésion"
|
||||
|
||||
|
|
@ -805,14 +805,14 @@ msgstr "Cliquez pour valider"
|
|||
msgid "No reason specified"
|
||||
msgstr "Pas de motif spécifié"
|
||||
|
||||
#: apps/note/tables.py:122 apps/note/tables.py:151 apps/wei/tables.py:66
|
||||
#: apps/note/tables.py:122 apps/note/tables.py:152 apps/wei/tables.py:66
|
||||
#: templates/treasury/sogecredit_detail.html:59
|
||||
#: templates/wei/weiregistration_confirm_delete.html:32
|
||||
msgid "Delete"
|
||||
msgstr "Supprimer"
|
||||
|
||||
#: apps/note/tables.py:146 apps/wei/tables.py:42 apps/wei/tables.py:43
|
||||
#: templates/member/club_info.html:67 templates/note/conso_form.html:121
|
||||
#: apps/note/tables.py:147 apps/wei/tables.py:42 apps/wei/tables.py:43
|
||||
#: templates/member/club_info.html:67 templates/note/conso_form.html:128
|
||||
#: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
|
||||
#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68
|
||||
msgid "Edit"
|
||||
|
|
@ -822,7 +822,7 @@ msgstr "Éditer"
|
|||
msgid "Transfer money"
|
||||
msgstr "Transférer de l'argent"
|
||||
|
||||
#: apps/note/views.py:137 templates/base.html:94
|
||||
#: apps/note/views.py:137 templates/base.html:93
|
||||
msgid "Consumptions"
|
||||
msgstr "Consommations"
|
||||
|
||||
|
|
@ -860,21 +860,33 @@ msgstr "masque"
|
|||
msgid "field"
|
||||
msgstr "champ"
|
||||
|
||||
#: apps/permission/models.py:181
|
||||
#: apps/permission/models.py:175
|
||||
msgid ""
|
||||
"Tells if the permission should be granted even if the membership of the user "
|
||||
"is expired."
|
||||
msgstr ""
|
||||
"Indique si la permission doit être attribuée même si l'adhésion de l'utilisateur "
|
||||
"est expirée."
|
||||
|
||||
#: apps/permission/models.py:176 templates/permission/all_rights.html:26
|
||||
msgid "permanent"
|
||||
msgstr "permanent"
|
||||
|
||||
#: apps/permission/models.py:187
|
||||
msgid "permission"
|
||||
msgstr "permission"
|
||||
|
||||
#: apps/permission/models.py:182 apps/permission/models.py:316
|
||||
#: apps/permission/models.py:188 apps/permission/models.py:322
|
||||
msgid "permissions"
|
||||
msgstr "permissions"
|
||||
|
||||
#: apps/permission/models.py:187
|
||||
#: apps/permission/models.py:193
|
||||
msgid "Specifying field applies only to view and change permission types."
|
||||
msgstr ""
|
||||
"Spécifie le champ concerné, ne fonctionne que pour les permissions view et "
|
||||
"change."
|
||||
|
||||
#: apps/permission/models.py:323 apps/permission/models.py:324
|
||||
#: apps/permission/models.py:329 apps/permission/models.py:330
|
||||
msgid "role permissions"
|
||||
msgstr "Permissions par rôles"
|
||||
|
||||
|
|
@ -965,14 +977,16 @@ msgstr ""
|
|||
"Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
|
||||
"{}"
|
||||
|
||||
#: apps/treasury/apps.py:12 templates/base.html:126
|
||||
#: apps/treasury/apps.py:12 templates/base.html:125
|
||||
msgid "Treasury"
|
||||
msgstr "Trésorerie"
|
||||
|
||||
#: apps/treasury/forms.py:85 apps/treasury/forms.py:133
|
||||
#: templates/activity/activity_form.html:9
|
||||
#: templates/activity/activity_invite.html:8
|
||||
#: templates/django_filters/rest_framework/form.html:5
|
||||
#: templates/member/add_members.html:14 templates/member/club_form.html:9
|
||||
#: templates/note/transactiontemplate_form.html:15
|
||||
#: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13
|
||||
#: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15
|
||||
#: templates/wei/weiregistration_form.html:14
|
||||
|
|
@ -992,7 +1006,7 @@ msgid "You can't change the type of the remittance."
|
|||
msgstr "Vous ne pouvez pas changer le type de la remise."
|
||||
|
||||
#: apps/treasury/forms.py:127 apps/treasury/tables.py:47
|
||||
#: apps/treasury/tables.py:113 templates/note/transaction_form.html:133
|
||||
#: apps/treasury/tables.py:113 templates/note/transaction_form.html:95
|
||||
#: templates/treasury/remittance_form.html:18
|
||||
msgid "Amount"
|
||||
msgstr "Montant"
|
||||
|
|
@ -1013,7 +1027,7 @@ msgstr "Objet"
|
|||
msgid "Description"
|
||||
msgstr "Description"
|
||||
|
||||
#: apps/treasury/models.py:48 templates/note/transaction_form.html:91
|
||||
#: apps/treasury/models.py:48 templates/note/transaction_form.html:120
|
||||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
|
|
@ -1162,13 +1176,13 @@ msgstr "Oui"
|
|||
msgid "No"
|
||||
msgstr "Non"
|
||||
|
||||
#: apps/wei/apps.py:10 apps/wei/models.py:45 apps/wei/models.py:46
|
||||
#: apps/wei/models.py:57 apps/wei/models.py:162 templates/base.html:116
|
||||
#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
|
||||
#: apps/wei/models.py:59 apps/wei/models.py:164 templates/base.html:130
|
||||
msgid "WEI"
|
||||
msgstr "WEI"
|
||||
|
||||
#: apps/wei/forms/registration.py:47 apps/wei/models.py:109
|
||||
#: apps/wei/models.py:271
|
||||
#: apps/wei/forms/registration.py:47 apps/wei/models.py:111
|
||||
#: apps/wei/models.py:273
|
||||
msgid "bus"
|
||||
msgstr "Bus"
|
||||
|
||||
|
|
@ -1194,7 +1208,7 @@ msgstr ""
|
|||
"bus ou électron libre)"
|
||||
|
||||
#: apps/wei/forms/registration.py:61 apps/wei/forms/registration.py:67
|
||||
#: apps/wei/models.py:143
|
||||
#: apps/wei/models.py:145
|
||||
msgid "WEI Roles"
|
||||
msgstr "Rôles au WEI"
|
||||
|
||||
|
|
@ -1206,97 +1220,97 @@ msgstr "Sélectionnez les rôles qui vous intéressent."
|
|||
msgid "This team doesn't belong to the given bus."
|
||||
msgstr "Cette équipe n'appartient pas à ce bus."
|
||||
|
||||
#: apps/wei/models.py:20 templates/wei/weiclub_info.html:23
|
||||
#: apps/wei/models.py:22 templates/wei/weiclub_info.html:23
|
||||
msgid "year"
|
||||
msgstr "année"
|
||||
|
||||
#: apps/wei/models.py:24 templates/wei/weiclub_info.html:17
|
||||
#: apps/wei/models.py:26 templates/wei/weiclub_info.html:17
|
||||
msgid "date start"
|
||||
msgstr "début"
|
||||
|
||||
#: apps/wei/models.py:28 templates/wei/weiclub_info.html:20
|
||||
#: apps/wei/models.py:30 templates/wei/weiclub_info.html:20
|
||||
msgid "date end"
|
||||
msgstr "fin"
|
||||
|
||||
#: apps/wei/models.py:73
|
||||
#: apps/wei/models.py:75
|
||||
msgid "survey information"
|
||||
msgstr "informations sur le questionnaire"
|
||||
|
||||
#: apps/wei/models.py:74
|
||||
#: apps/wei/models.py:76
|
||||
msgid "Information about the survey for new members, encoded in JSON"
|
||||
msgstr ""
|
||||
"Informations sur le sondage pour les nouveaux membres, encodées en JSON"
|
||||
|
||||
#: apps/wei/models.py:96
|
||||
#: apps/wei/models.py:98
|
||||
msgid "Bus"
|
||||
msgstr "Bus"
|
||||
|
||||
#: apps/wei/models.py:97 templates/wei/weiclub_tables.html:79
|
||||
#: apps/wei/models.py:99 templates/wei/weiclub_tables.html:79
|
||||
msgid "Buses"
|
||||
msgstr "Bus"
|
||||
|
||||
#: apps/wei/models.py:117
|
||||
#: apps/wei/models.py:119
|
||||
msgid "color"
|
||||
msgstr "couleur"
|
||||
|
||||
#: apps/wei/models.py:118
|
||||
#: apps/wei/models.py:120
|
||||
msgid "The color of the T-Shirt, stored with its number equivalent"
|
||||
msgstr ""
|
||||
"La couleur du T-Shirt, stocké sous la forme de son équivalent numérique"
|
||||
|
||||
#: apps/wei/models.py:132
|
||||
#: apps/wei/models.py:134
|
||||
msgid "Bus team"
|
||||
msgstr "Équipe de bus"
|
||||
|
||||
#: apps/wei/models.py:133
|
||||
#: apps/wei/models.py:135
|
||||
msgid "Bus teams"
|
||||
msgstr "Équipes de bus"
|
||||
|
||||
#: apps/wei/models.py:142
|
||||
#: apps/wei/models.py:144
|
||||
msgid "WEI Role"
|
||||
msgstr "Rôle au WEI"
|
||||
|
||||
#: apps/wei/models.py:167
|
||||
#: apps/wei/models.py:169
|
||||
msgid "Credit from Société générale"
|
||||
msgstr "Crédit de la Société générale"
|
||||
|
||||
#: apps/wei/models.py:172
|
||||
#: apps/wei/models.py:174
|
||||
msgid "Caution check given"
|
||||
msgstr "Chèque de caution donné"
|
||||
|
||||
#: apps/wei/models.py:176 templates/wei/weimembership_form.html:62
|
||||
#: apps/wei/models.py:178 templates/wei/weimembership_form.html:62
|
||||
msgid "birth date"
|
||||
msgstr "date de naissance"
|
||||
|
||||
#: apps/wei/models.py:182
|
||||
#: apps/wei/models.py:184
|
||||
msgid "Male"
|
||||
msgstr "Homme"
|
||||
|
||||
#: apps/wei/models.py:183
|
||||
#: apps/wei/models.py:185
|
||||
msgid "Female"
|
||||
msgstr "Femme"
|
||||
|
||||
#: apps/wei/models.py:184
|
||||
#: apps/wei/models.py:186
|
||||
msgid "Non binary"
|
||||
msgstr "Non-binaire"
|
||||
|
||||
#: apps/wei/models.py:186 templates/wei/weimembership_form.html:59
|
||||
#: apps/wei/models.py:188 templates/wei/weimembership_form.html:59
|
||||
msgid "gender"
|
||||
msgstr "genre"
|
||||
|
||||
#: apps/wei/models.py:192 templates/wei/weimembership_form.html:65
|
||||
#: apps/wei/models.py:194 templates/wei/weimembership_form.html:65
|
||||
msgid "health issues"
|
||||
msgstr "problèmes de santé"
|
||||
|
||||
#: apps/wei/models.py:197 templates/wei/weimembership_form.html:68
|
||||
#: apps/wei/models.py:199 templates/wei/weimembership_form.html:68
|
||||
msgid "emergency contact name"
|
||||
msgstr "Nom du contact en cas d'urgence"
|
||||
|
||||
#: apps/wei/models.py:202 templates/wei/weimembership_form.html:71
|
||||
#: apps/wei/models.py:204 templates/wei/weimembership_form.html:71
|
||||
msgid "emergency contact phone"
|
||||
msgstr "Téléphone du contact en cas d'urgence"
|
||||
|
||||
#: apps/wei/models.py:207 templates/wei/weimembership_form.html:74
|
||||
#: apps/wei/models.py:209 templates/wei/weimembership_form.html:74
|
||||
msgid ""
|
||||
"Register on the mailing list to stay informed of the events of the campus (1 "
|
||||
"mail/week)"
|
||||
|
|
@ -1304,7 +1318,7 @@ msgstr ""
|
|||
"S'inscrire sur la liste de diffusion pour rester informé des événements sur "
|
||||
"le campus (1 mail par semaine)"
|
||||
|
||||
#: apps/wei/models.py:212 templates/wei/weimembership_form.html:77
|
||||
#: apps/wei/models.py:214 templates/wei/weimembership_form.html:77
|
||||
msgid ""
|
||||
"Register on the mailing list to stay informed of the sport events of the "
|
||||
"campus (1 mail/week)"
|
||||
|
|
@ -1312,7 +1326,7 @@ msgstr ""
|
|||
"S'inscrire sur la liste de diffusion pour rester informé des actualités "
|
||||
"sportives sur le campus (1 mail par semaine)"
|
||||
|
||||
#: apps/wei/models.py:217 templates/wei/weimembership_form.html:80
|
||||
#: apps/wei/models.py:219 templates/wei/weimembership_form.html:80
|
||||
msgid ""
|
||||
"Register on the mailing list to stay informed of the art events of the "
|
||||
"campus (1 mail/week)"
|
||||
|
|
@ -1320,19 +1334,19 @@ msgstr ""
|
|||
"S'inscrire sur la liste de diffusion pour rester informé des actualités "
|
||||
"artistiques sur le campus (1 mail par semaine)"
|
||||
|
||||
#: apps/wei/models.py:222 templates/wei/weimembership_form.html:56
|
||||
#: apps/wei/models.py:224 templates/wei/weimembership_form.html:56
|
||||
msgid "first year"
|
||||
msgstr "première année"
|
||||
|
||||
#: apps/wei/models.py:223
|
||||
#: apps/wei/models.py:225
|
||||
msgid "Tells if the user is new in the school."
|
||||
msgstr "Indique si l'utilisateur est nouveau dans l'école."
|
||||
|
||||
#: apps/wei/models.py:228
|
||||
#: apps/wei/models.py:230
|
||||
msgid "registration information"
|
||||
msgstr "informations sur l'inscription"
|
||||
|
||||
#: apps/wei/models.py:229
|
||||
#: apps/wei/models.py:231
|
||||
msgid ""
|
||||
"Information about the registration (buses for old members, survey fot the "
|
||||
"new members), encoded in JSON"
|
||||
|
|
@ -1340,27 +1354,27 @@ msgstr ""
|
|||
"Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
|
||||
"1A), encodées en JSON"
|
||||
|
||||
#: apps/wei/models.py:260
|
||||
#: apps/wei/models.py:262
|
||||
msgid "WEI User"
|
||||
msgstr "Participant au WEI"
|
||||
|
||||
#: apps/wei/models.py:261
|
||||
#: apps/wei/models.py:263
|
||||
msgid "WEI Users"
|
||||
msgstr "Participants au WEI"
|
||||
|
||||
#: apps/wei/models.py:281
|
||||
#: apps/wei/models.py:283
|
||||
msgid "team"
|
||||
msgstr "équipe"
|
||||
|
||||
#: apps/wei/models.py:291
|
||||
#: apps/wei/models.py:293
|
||||
msgid "WEI registration"
|
||||
msgstr "inscription au WEI"
|
||||
|
||||
#: apps/wei/models.py:295
|
||||
#: apps/wei/models.py:297
|
||||
msgid "WEI membership"
|
||||
msgstr "adhésion au WEI"
|
||||
|
||||
#: apps/wei/models.py:296
|
||||
#: apps/wei/models.py:298
|
||||
msgid "WEI memberships"
|
||||
msgstr "adhésions au WEI"
|
||||
|
||||
|
|
@ -1558,23 +1572,29 @@ msgstr "Toutes les activités"
|
|||
msgid "The ENS Paris-Saclay BDE note."
|
||||
msgstr "La note du BDE de l'ENS Paris-Saclay."
|
||||
|
||||
#: templates/base.html:104
|
||||
#: templates/base.html:103
|
||||
msgid "Users"
|
||||
msgstr "Utilisateurs"
|
||||
|
||||
#: templates/base.html:109
|
||||
#: templates/base.html:108
|
||||
msgid "Clubs"
|
||||
msgstr "Clubs"
|
||||
|
||||
#: templates/base.html:115
|
||||
#: templates/base.html:114
|
||||
msgid "Registrations"
|
||||
msgstr "Inscriptions"
|
||||
|
||||
#: templates/base.html:120
|
||||
#: templates/base.html:134
|
||||
msgid "Rights"
|
||||
msgstr "Droits"
|
||||
|
||||
#: templates/base.html:158
|
||||
#: templates/base.html:138
|
||||
#, fuzzy
|
||||
#| msgid "registration"
|
||||
msgid "Administration"
|
||||
msgstr "inscription"
|
||||
|
||||
#: templates/base.html:177
|
||||
msgid ""
|
||||
"Your e-mail address is not validated. Please check your mail inbox and click "
|
||||
"on the validation link."
|
||||
|
|
@ -1597,6 +1617,11 @@ msgstr ""
|
|||
"la version %(VERSION)s et la dernière version est %(LAST_VERSION)s. Merci de "
|
||||
"vous mettre à jour."
|
||||
|
||||
#: templates/django_filters/rest_framework/crispy_form.html:4
|
||||
#: templates/django_filters/rest_framework/form.html:2
|
||||
msgid "Field filters"
|
||||
msgstr ""
|
||||
|
||||
#: templates/member/alias_update.html:5
|
||||
msgid "Add alias"
|
||||
msgstr "Ajouter un alias"
|
||||
|
|
@ -1613,7 +1638,7 @@ msgstr "jours"
|
|||
msgid "membership fee"
|
||||
msgstr "cotisation pour adhérer"
|
||||
|
||||
#: templates/member/club_info.html:50 templates/member/profile_info.html:33
|
||||
#: templates/member/club_info.html:50 templates/member/profile_info.html:35
|
||||
#: templates/treasury/sogecredit_detail.html:18
|
||||
#: templates/wei/weiclub_info.html:43
|
||||
msgid "balance"
|
||||
|
|
@ -1623,7 +1648,7 @@ msgstr "solde du compte"
|
|||
msgid "Add member"
|
||||
msgstr "Ajouter un membre"
|
||||
|
||||
#: templates/member/club_info.html:71 templates/member/profile_info.html:48
|
||||
#: templates/member/club_info.html:71 templates/member/profile_info.html:50
|
||||
msgid "View Profile"
|
||||
msgstr "Voir le profil"
|
||||
|
||||
|
|
@ -1671,17 +1696,15 @@ msgstr "Compte n°"
|
|||
msgid "username"
|
||||
msgstr "pseudo"
|
||||
|
||||
#: templates/member/profile_info.html:20
|
||||
#: templates/registration/future_profile_detail.html:34
|
||||
#: templates/member/profile_info.html:21
|
||||
msgid "password"
|
||||
msgstr "mot de passe"
|
||||
|
||||
#: templates/member/profile_info.html:23
|
||||
#: templates/registration/future_profile_detail.html:37
|
||||
#: templates/member/profile_info.html:24
|
||||
msgid "Change password"
|
||||
msgstr "Changer le mot de passe"
|
||||
|
||||
#: templates/member/profile_info.html:41
|
||||
#: templates/member/profile_info.html:43
|
||||
msgid "Manage auth token"
|
||||
msgstr "Gérer les jetons d'authentification"
|
||||
|
||||
|
|
@ -1850,18 +1873,18 @@ msgstr ""
|
|||
"Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter "
|
||||
"pour activer votre compte."
|
||||
|
||||
#: templates/registration/future_profile_detail.html:56
|
||||
#: templates/registration/future_profile_detail.html:49
|
||||
#: templates/wei/weiregistration_confirm_delete.html:12
|
||||
msgid "Delete registration"
|
||||
msgstr "Supprimer l'inscription"
|
||||
|
||||
#: templates/registration/future_profile_detail.html:64
|
||||
#: templates/registration/future_profile_detail.html:57
|
||||
msgid "Validate account"
|
||||
msgstr "Valider le compte"
|
||||
|
||||
#: templates/registration/future_profile_detail.html:71
|
||||
#: templates/wei/weimembership_form.html:132
|
||||
#: templates/wei/weimembership_form.html:190
|
||||
#: templates/registration/future_profile_detail.html:64
|
||||
#: templates/wei/weimembership_form.html:134
|
||||
#: templates/wei/weimembership_form.html:192
|
||||
msgid "Validate registration"
|
||||
msgstr "Valider l'inscription"
|
||||
|
||||
|
|
@ -2281,32 +2304,32 @@ msgstr "équipe préférée"
|
|||
msgid "preferred roles"
|
||||
msgstr "rôles préférés"
|
||||
|
||||
#: templates/wei/weimembership_form.html:123
|
||||
#: templates/wei/weimembership_form.html:122
|
||||
#: templates/wei/weiregistration_confirm_delete.html:31
|
||||
msgid "Update registration"
|
||||
msgstr "Mettre à jour l'inscription"
|
||||
|
||||
#: templates/wei/weimembership_form.html:136
|
||||
#: templates/wei/weimembership_form.html:138
|
||||
msgid "The registration is already validated and can't be unvalidated."
|
||||
msgstr "L'inscription a déjà été validée et ne peut pas être dévalidée."
|
||||
|
||||
#: templates/wei/weimembership_form.html:137
|
||||
#: templates/wei/weimembership_form.html:139
|
||||
msgid "The user joined the bus"
|
||||
msgstr "L'utilisateur a rejoint le bus"
|
||||
|
||||
#: templates/wei/weimembership_form.html:138
|
||||
#: templates/wei/weimembership_form.html:140
|
||||
msgid "in the team"
|
||||
msgstr "dans l'équipe"
|
||||
|
||||
#: templates/wei/weimembership_form.html:139
|
||||
#: templates/wei/weimembership_form.html:141
|
||||
msgid "in no team (staff)"
|
||||
msgstr "dans aucune équipe (staff)"
|
||||
|
||||
#: templates/wei/weimembership_form.html:139
|
||||
#: templates/wei/weimembership_form.html:141
|
||||
msgid "with the following roles:"
|
||||
msgstr "avec les rôles suivants :"
|
||||
|
||||
#: templates/wei/weimembership_form.html:144
|
||||
#: templates/wei/weimembership_form.html:146
|
||||
msgid ""
|
||||
"\n"
|
||||
" The WEI will be paid by Société générale. The "
|
||||
|
|
@ -2325,7 +2348,7 @@ msgstr ""
|
|||
"aura validé la création du compte, ou bien changer de moyen de paiement.\n"
|
||||
" "
|
||||
|
||||
#: templates/wei/weimembership_form.html:154
|
||||
#: templates/wei/weimembership_form.html:156
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
@ -2338,15 +2361,15 @@ msgstr ""
|
|||
"L'inscription va échouer.\n"
|
||||
" "
|
||||
|
||||
#: templates/wei/weimembership_form.html:161
|
||||
#: templates/wei/weimembership_form.html:163
|
||||
msgid "The note has enough money, the registration is possible."
|
||||
msgstr "La note a assez d'argent, l'inscription est possible."
|
||||
|
||||
#: templates/wei/weimembership_form.html:168
|
||||
#: templates/wei/weimembership_form.html:170
|
||||
msgid "The user didn't give her/his caution check."
|
||||
msgstr "L'utilisateur n'a pas donné son chèque de caution."
|
||||
|
||||
#: templates/wei/weimembership_form.html:176
|
||||
#: templates/wei/weimembership_form.html:178
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
|
|||
|
|
@ -44,14 +44,8 @@ ALLOWED_HOSTS = ['*']
|
|||
|
||||
# Emails
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||
# EMAIL_USE_SSL = False
|
||||
# EMAIL_HOST = 'smtp.example.org'
|
||||
# EMAIL_PORT = 25
|
||||
# EMAIL_HOST_USER = 'change_me'
|
||||
# EMAIL_HOST_PASSWORD = 'change_me'
|
||||
|
||||
SERVER_EMAIL = 'no-reply@' + os.getenv("DOMAIN", "example.com")
|
||||
SERVER_EMAIL = 'notekfet@localhost'
|
||||
|
||||
# Security settings
|
||||
SECURE_CONTENT_TYPE_NOSNIFF = False
|
||||
|
|
|
|||
|
|
@ -33,15 +33,14 @@ ALLOWED_HOSTS = [os.environ.get('NOTE_URL', 'localhost')]
|
|||
SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS')
|
||||
|
||||
# Emails
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||
# EMAIL_USE_SSL = False
|
||||
# EMAIL_HOST = 'smtp.example.org'
|
||||
# EMAIL_PORT = 25
|
||||
# EMAIL_HOST_USER = 'change_me'
|
||||
# EMAIL_HOST_PASSWORD = 'change_me'
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||
EMAIL_USE_SSL = False
|
||||
EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
|
||||
EMAIL_PORT = os.getenv('EMAIL_PORT', 443)
|
||||
EMAIL_HOST_USER = os.getenv('EMAIL_USER', 'change_me')
|
||||
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', 'change_me')
|
||||
|
||||
SERVER_EMAIL = 'no-reply@' + os.getenv("DOMAIN", "example.com")
|
||||
SERVER_EMAIL = os.getenv("NOTE_MAIL", "notekfet@example.com")
|
||||
|
||||
# Security settings
|
||||
SECURE_CONTENT_TYPE_NOSNIFF = False
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
# CAS
|
||||
OPTIONAL_APPS = [
|
||||
# 'cas_server',
|
||||
# 'cas',
|
||||
# 'debug_toolbar'
|
||||
]
|
||||
|
||||
ADMINS = [('Note Kfet', 'notekfet@example.com')]
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{% endif %}
|
||||
<ul>
|
||||
{% for permission in role.permissions.permissions.all %}
|
||||
<li data-toggle="tooltip" title="{% trans "Query:" %} {{ permission.query }}">{{ permission }} ({{ permission.type }} {{ permission.model }})</li>
|
||||
<li data-toggle="tooltip" title="{% trans "Query:" %} {{ permission.query }}">{{ permission }} ({{ permission.type }} {{ permission.model }}{% if permission.permanent %}, {% trans "permanent" %}{% endif %})</li>
|
||||
{% empty %}
|
||||
<em>{% trans "No associated permission" %}</em>
|
||||
{% endfor %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue