ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'beta' into 'main' 

Correction translation of sport events ml

See merge request bde/nk20!276
This commit is contained in:
thomasl 2024-09-18 13:52:33 +02:00
parent 2e27d4f05c 09fb1d227e
commit a0de63effd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/wei/forms/surveys/wei2024.py
View File

@ -279,7 +279,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
# surveys = [s for s in surveys if s.bus_id != None] # surveys = [s for s in surveys if s.bus_id != None]
# surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded] # surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
# surveys = [s for s in surveys if s.registration.user_id in free_users] # surveys = [s for s in surveys if s.registration.user_id in free_users]
# hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True) # hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True)
@ -288,7 +287,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
hardcoded_first_year_mb = WEIMembership.objects.filter(registration__first_year=True) hardcoded_first_year_mb = WEIMembership.objects.filter(registration__first_year=True)
hardcoded_first_year = {mb.user.id if mb.bus else None: mb.bus.id if mb.bus else None for mb in hardcoded_first_year_mb} hardcoded_first_year = {mb.user.id if mb.bus else None: mb.bus.id if mb.bus else None for mb in hardcoded_first_year_mb}
# Reset previous algorithm run # Reset previous algorithm run
for survey in surveys: for survey in surveys:
survey.free() survey.free()
@ -296,7 +294,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
survey.select_bus(hardcoded_first_year[s.registration.user_id]) survey.select_bus(hardcoded_first_year[s.registration.user_id])
survey.save() survey.save()
non_men = [s for s in surveys if s.registration.gender != 'male'] non_men = [s for s in surveys if s.registration.gender != 'male']
men = [s for s in surveys if s.registration.gender == 'male'] men = [s for s in surveys if s.registration.gender == 'male']

1
locale/fr/LC_MESSAGES/django.po
View File

@ -1032,6 +1032,7 @@ msgid ""
"Register on the mailing list to stay informed of the sport events of the " "Register on the mailing list to stay informed of the sport events of the "
"campus (1 mail/week)" "campus (1 mail/week)"
msgstr "" msgstr ""
"S'inscrire sur la liste de diffusion pour rester informé·e des actualités "
"sportives sur le campus (1 mail par semaine)" "sportives sur le campus (1 mail par semaine)"
#: apps/member/models.py:113 #: apps/member/models.py:113