diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9ecb4d56..cd7fe02a 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-01 17:42+0200\n" +"POT-Creation-Date: 2018-09-20 14:41+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -4412,12 +4412,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:570 +#: sith/settings.py:575 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:570 +#: sith/settings.py:575 msgid "Drying" msgstr "Séchage" @@ -4736,103 +4736,107 @@ msgstr "Bénévole Eurockéennes" msgid "Six weeks for free" msgstr "6 semaines gratuites" -#: sith/settings.py:534 +#: sith/settings.py:517 +msgid "One day" +msgstr "Un jour" + +#: sith/settings.py:539 msgid "President" msgstr "Président" -#: sith/settings.py:535 +#: sith/settings.py:540 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:536 +#: sith/settings.py:541 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:537 +#: sith/settings.py:542 msgid "Communication supervisor" msgstr "Responsable communication" -#: sith/settings.py:538 +#: sith/settings.py:543 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:539 +#: sith/settings.py:544 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:540 +#: sith/settings.py:545 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:541 +#: sith/settings.py:546 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:542 +#: sith/settings.py:547 msgid "Curious" msgstr "Curieux" -#: sith/settings.py:577 +#: sith/settings.py:582 msgid "A new poster needs to be moderated" msgstr "Une nouvelle affiche a besoin d'être modérée" -#: sith/settings.py:578 +#: sith/settings.py:583 msgid "A new mailing list needs to be moderated" msgstr "Une nouvelle mailing list a besoin d'être modérée" -#: sith/settings.py:579 +#: sith/settings.py:584 #, 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:580 +#: sith/settings.py:585 msgid "New files to be moderated" msgstr "Nouveaux fichiers à modérer" -#: sith/settings.py:581 +#: sith/settings.py:586 #, 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:582 +#: sith/settings.py:587 msgid "You've been identified on some pictures" msgstr "Vous avez été identifié sur des photos" -#: sith/settings.py:583 +#: sith/settings.py:588 #, python-format msgid "You just refilled of %s €" msgstr "Vous avez rechargé votre compte de %s€" -#: sith/settings.py:584 +#: sith/settings.py:589 #, python-format msgid "You just bought %s" msgstr "Vous avez acheté %s" -#: sith/settings.py:585 +#: sith/settings.py:590 msgid "You have a notification" msgstr "Vous avez une notification" -#: sith/settings.py:597 +#: sith/settings.py:602 msgid "Success!" msgstr "Succès !" -#: sith/settings.py:598 +#: sith/settings.py:603 msgid "Fail!" msgstr "Échec !" -#: sith/settings.py:599 +#: sith/settings.py:604 msgid "You successfully posted an article in the Weekmail" msgstr "Article posté avec succès dans le Weekmail" -#: sith/settings.py:600 +#: sith/settings.py:605 msgid "You successfully edited an article in the Weekmail" msgstr "Article édité avec succès dans le Weekmail" -#: sith/settings.py:601 +#: sith/settings.py:606 msgid "You successfully sent the Weekmail" msgstr "Weekmail envoyé avec succès" -#: sith/settings.py:610 +#: sith/settings.py:615 msgid "AE tee-shirt" msgstr "Tee-shirt AE" diff --git a/sith/settings.py b/sith/settings.py index 437f558f..e40bc343 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -512,6 +512,11 @@ SITH_SUBSCRIPTIONS = { 'name': _('Six weeks for free'), 'price': 0, 'duration': 0.23, + }, + 'un-jour': { + 'name': _('One day'), + 'price': 0, + 'duration': 0.00555333, } # To be completed.... } diff --git a/subscription/migrations/0009_auto_20180920_1421.py b/subscription/migrations/0009_auto_20180920_1421.py new file mode 100644 index 00000000..4d975dcd --- /dev/null +++ b/subscription/migrations/0009_auto_20180920_1421.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.15 on 2018-09-20 12:21 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('subscription', '0008_auto_20180831_2016'), + ] + + 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-branche', 'Branch cursus'), ('cursus-tronc-commun', 'Common core cursus'), ('deux-mois-essai', 'Two months for free'), ('deux-semestres', 'Two semesters'), ('membre-honoraire', 'Honorary member'), ('reseau-ut', 'UT network member'), ('sbarro/esta', 'Sbarro/ESTA member'), ('six-semaines-essai', 'Six weeks for free'), ('un-jour', 'Un jour'), ('un-semestre', 'One semester'), ('un-semestre-welcome', 'One semester Welcome Week')], max_length=255, verbose_name='subscription type'), + ), + ] diff --git a/subscription/migrations/0010_auto_20180920_1441.py b/subscription/migrations/0010_auto_20180920_1441.py new file mode 100644 index 00000000..97b879ad --- /dev/null +++ b/subscription/migrations/0010_auto_20180920_1441.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.15 on 2018-09-20 12:41 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('subscription', '0009_auto_20180920_1421'), + ] + + 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-branche', 'Branch cursus'), ('cursus-tronc-commun', 'Common core cursus'), ('deux-mois-essai', 'Two months for free'), ('deux-semestres', 'Two semesters'), ('membre-honoraire', 'Honorary 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-welcome', 'One semester Welcome Week')], max_length=255, verbose_name='subscription type'), + ), + ] diff --git a/subscription/tests.py b/subscription/tests.py index 20bead75..6003df62 100644 --- a/subscription/tests.py +++ b/subscription/tests.py @@ -117,6 +117,16 @@ class SubscriptionIntegrationTest(TestCase): s.save() self.assertTrue(s.subscription_end == date(2017, 10, 29)) + def test_duration_two_months(self): + + s = Subscription(member=User.objects.filter(pk=self.user.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[3], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0]) + s.subscription_start = date(2017, 8, 29) + s.subscription_end = s.compute_end(duration=settings.SITH_SUBSCRIPTIONS['un-jour']['duration'], + start=s.subscription_start) + s.save() + self.assertTrue(s.subscription_end == date(2017, 8, 30)) + def test_duration_three_months(self): s = Subscription(member=User.objects.filter(pk=self.user.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[3],