Merge branch 'nix-shell' into 'main'

Nix shell

See merge request bde/nk20!201

apps/permission/fixtures/initial.json

@@ -3912,8 +3912,7 @@
                 12,
                 13,
                 14,
-                22,
+                22
-                48
             ]
         }
     },
@@ -3962,7 +3961,6 @@
             "for_club": null,
             "name": "Tr\u00e9sorièr\u22c5e de club",
             "permissions": [
-                6,
                 19,
                 20,
                 21,

apps/wei/forms/surveys/wei2024.py

@@ -279,6 +279,7 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         # 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 s.registration.user_id in free_users]
 
         # hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True)
@@ -287,6 +288,7 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         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}
 
+
         # Reset previous algorithm run
         for survey in surveys:
             survey.free()
@@ -294,6 +296,7 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
                 survey.select_bus(hardcoded_first_year[s.registration.user_id])
             survey.save()
 
+
         non_men = [s for s in surveys if s.registration.gender != 'male']
         men = [s for s in surveys if s.registration.gender == 'male']
 

locale/fr/LC_MESSAGES/django.po

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