Merge branch 'och' into 'master'

settings: Added a new subscription

See merge request !274

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-22 16:12+0100\n"
+"POT-Creation-Date: 2020-06-15 19:39+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"
@@ -1378,7 +1378,7 @@ msgid "History"
 msgstr "Historique"
 
 #: club/views.py:125 core/templates/core/base.jinja:118 core/views/user.py:219
-#: sas/templates/sas/picture.jinja:95 trombi/views.py:63
+#: sas/templates/sas/picture.jinja:95 trombi/views.py:61
 msgid "Tools"
 msgstr "Outils"
 
@@ -4755,12 +4755,12 @@ msgid "Washing and drying"
 msgstr "Lavage et séchage"
 
 #: launderette/templates/launderette/launderette_book.jinja:27
-#: sith/settings.py:592
+#: sith/settings.py:593
 msgid "Washing"
 msgstr "Lavage"
 
 #: launderette/templates/launderette/launderette_book.jinja:31
-#: sith/settings.py:592
+#: sith/settings.py:593
 msgid "Drying"
 msgstr "Séchage"
 
@@ -5494,128 +5494,132 @@ msgstr "6 semaines gratuites"
 msgid "One day"
 msgstr "Un jour"
 
-#: sith/settings.py:510
+#: sith/settings.py:508
+msgid "GA staff member"
+msgstr "Membre staff GA (2 semaines), 1 €"
+
+#: sith/settings.py:511
 msgid "One semester (-20%)"
 msgstr "Un semestre (-20%), 12 €"
 
-#: sith/settings.py:515
+#: sith/settings.py:516
 msgid "Two semesters (-20%)"
 msgstr "Deux semestres (-20%), 22 €"
 
-#: sith/settings.py:520
+#: sith/settings.py:521
 msgid "Common core cursus (-20%)"
 msgstr "Cursus tronc commun (-20%), 36 €"
 
-#: sith/settings.py:525
+#: sith/settings.py:526
 msgid "Branch cursus (-20%)"
 msgstr "Cursus branche (-20%), 36 €"
 
-#: sith/settings.py:530
+#: sith/settings.py:531
 msgid "Alternating cursus (-20%)"
 msgstr "Cursus alternant (-20%), 24 €"
 
-#: sith/settings.py:552
+#: sith/settings.py:553
 msgid "President"
 msgstr "Président"
 
-#: sith/settings.py:553
+#: sith/settings.py:554
 msgid "Vice-President"
 msgstr "Vice-Président"
 
-#: sith/settings.py:554
+#: sith/settings.py:555
 msgid "Treasurer"
 msgstr "Trésorier"
 
-#: sith/settings.py:555
+#: sith/settings.py:556
 msgid "Communication supervisor"
 msgstr "Responsable communication"
 
-#: sith/settings.py:556
+#: sith/settings.py:557
 msgid "Secretary"
 msgstr "Secrétaire"
 
-#: sith/settings.py:557
+#: sith/settings.py:558
 msgid "IT supervisor"
 msgstr "Responsable info"
 
-#: sith/settings.py:558
+#: sith/settings.py:559
 msgid "Board member"
 msgstr "Membre du bureau"
 
-#: sith/settings.py:559
+#: sith/settings.py:560
 msgid "Active member"
 msgstr "Membre actif"
 
-#: sith/settings.py:560
+#: sith/settings.py:561
 msgid "Curious"
 msgstr "Curieux"
 
-#: sith/settings.py:596
+#: sith/settings.py:597
 msgid "A new poster needs to be moderated"
 msgstr "Une nouvelle affiche a besoin d'être modérée"
 
-#: sith/settings.py:597
+#: sith/settings.py:598
 msgid "A new mailing list needs to be moderated"
 msgstr "Une nouvelle mailing list a besoin d'être modérée"
 
-#: sith/settings.py:600
+#: sith/settings.py:601
 msgid "A new pedagogy comment has been signaled for moderation"
 msgstr ""
 "Un nouveau commentaire de la pédagogie a été signalé pour la modération"
 
-#: sith/settings.py:602
+#: sith/settings.py:603
 #, python-format
 msgid "There are %s fresh news to be moderated"
 msgstr "Il y a %s nouvelles toutes fraîches à modérer"
 
-#: sith/settings.py:603
+#: sith/settings.py:604
 msgid "New files to be moderated"
 msgstr "Nouveaux fichiers à modérer"
 
-#: sith/settings.py:604
+#: sith/settings.py:605
 #, python-format
 msgid "There are %s pictures to be moderated in the SAS"
 msgstr "Il y a %s photos à modérer dans le SAS"
 
-#: sith/settings.py:605
+#: sith/settings.py:606
 msgid "You've been identified on some pictures"
 msgstr "Vous avez été identifié sur des photos"
 
-#: sith/settings.py:606
+#: sith/settings.py:607
 #, python-format
 msgid "You just refilled of %s €"
 msgstr "Vous avez rechargé votre compte de %s€"
 
-#: sith/settings.py:607
+#: sith/settings.py:608
 #, python-format
 msgid "You just bought %s"
 msgstr "Vous avez acheté %s"
 
-#: sith/settings.py:608
+#: sith/settings.py:609
 msgid "You have a notification"
 msgstr "Vous avez une notification"
 
-#: sith/settings.py:620
+#: sith/settings.py:621
 msgid "Success!"
 msgstr "Succès !"
 
-#: sith/settings.py:621
+#: sith/settings.py:622
 msgid "Fail!"
 msgstr "Échec !"
 
-#: sith/settings.py:622
+#: sith/settings.py:623
 msgid "You successfully posted an article in the Weekmail"
 msgstr "Article posté avec succès dans le Weekmail"
 
-#: sith/settings.py:623
+#: sith/settings.py:624
 msgid "You successfully edited an article in the Weekmail"
 msgstr "Article édité avec succès dans le Weekmail"
 
-#: sith/settings.py:624
+#: sith/settings.py:625
 msgid "You successfully sent the Weekmail"
 msgstr "Weekmail envoyé avec succès"
 
-#: sith/settings.py:632
+#: sith/settings.py:633
 msgid "AE tee-shirt"
 msgstr "Tee-shirt AE"
 

sith/settings.py

@@ -505,6 +505,7 @@ SITH_SUBSCRIPTIONS = {
         "duration": 0.23,
     },
     "un-jour": {"name": _("One day"), "price": 0, "duration": 0.00555333},
+    "membre-staff-ga": {"name": _("GA staff member"), "price": 1, "duration": 0.076},
     # Discount subscriptions
     "un-semestre-reduction": {
         "name": _("One semester (-20%)"),

subscription/migrations/0012_auto_20200615_1438.py

+# Generated by Django 2.2.13 on 2020-06-15 12:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("subscription", "0011_auto_20190825_2215"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="subscription",
+            name="subscription_type",
+            field=models.CharField(
+                choices=[
+                    ("amicale/doceo", "Amicale/DOCEO member"),
+                    ("assidu", "Assidu member"),
+                    ("benevoles-euroks", "Eurok's volunteer"),
+                    ("crous", "CROUS member"),
+                    ("cursus-alternant", "Alternating cursus"),
+                    ("cursus-alternant-reduction", "Alternating cursus (-20%)"),
+                    ("cursus-branche", "Branch cursus"),
+                    ("cursus-branche-reduction", "Branch cursus (-20%)"),
+                    ("cursus-tronc-commun", "Common core cursus"),
+                    ("cursus-tronc-commun-reduction", "Common core cursus (-20%)"),
+                    ("deux-mois-essai", "Two months for free"),
+                    ("deux-semestres", "Two semesters"),
+                    ("deux-semestres-reduction", "Two semesters (-20%)"),
+                    ("membre-honoraire", "Honorary member"),
+                    ("membre-staff-ga", "GA staff member"),
+                    ("reseau-ut", "UT network member"),
+                    ("sbarro/esta", "Sbarro/ESTA member"),
+                    ("six-semaines-essai", "Six weeks for free"),
+                    ("un-jour", "One day"),
+                    ("un-semestre", "One semester"),
+                    ("un-semestre-reduction", "One semester (-20%)"),
+                    ("un-semestre-welcome", "One semester Welcome Week"),
+                ],
+                max_length=255,
+                verbose_name="subscription type",
+            ),
+        ),
+    ]