Commit 94582a2d authored by Krophil's avatar Krophil

Free subscription for jewels

parent 02b317ee
...@@ -1365,8 +1365,15 @@ msgid "Notices" ...@@ -1365,8 +1365,15 @@ msgid "Notices"
msgstr "Information" msgstr "Information"
#: com/templates/com/news_admin_list.jinja:14 #: com/templates/com/news_admin_list.jinja:14
<<<<<<< 02b317eeb9274ad44a74856c412b3a2a0e8eda
msgid "Displayed notices" msgid "Displayed notices"
msgstr "Informations affichées" msgstr "Informations affichées"
=======
#, fuzzy
#| msgid "Legal notices"
msgid "Displayed notices"
msgstr "Mentions légales"
>>>>>>> Free subscription for jewels
#: com/templates/com/news_admin_list.jinja:18 #: com/templates/com/news_admin_list.jinja:18
#: com/templates/com/news_admin_list.jinja:47 #: com/templates/com/news_admin_list.jinja:47
...@@ -1435,8 +1442,15 @@ msgid "Remove" ...@@ -1435,8 +1442,15 @@ msgid "Remove"
msgstr "Retirer" msgstr "Retirer"
#: com/templates/com/news_admin_list.jinja:43 #: com/templates/com/news_admin_list.jinja:43
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
msgid "Notices to moderate" msgid "Notices to moderate"
msgstr "Informations à modérer" msgstr "Informations à modérer"
=======
#, fuzzy
#| msgid "New files to be moderated"
msgid "Notices to moderate"
msgstr "Nouveaux fichiers à modérer"
>>>>>>> Free subscription for jewels
#: com/templates/com/news_admin_list.jinja:72 #: com/templates/com/news_admin_list.jinja:72
msgid "Weeklies" msgid "Weeklies"
...@@ -1444,7 +1458,11 @@ msgstr "Nouvelles hebdomadaires" ...@@ -1444,7 +1458,11 @@ msgstr "Nouvelles hebdomadaires"
#: com/templates/com/news_admin_list.jinja:74 #: com/templates/com/news_admin_list.jinja:74
msgid "Displayed weeklies" msgid "Displayed weeklies"
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
msgstr "Nouvelles hebdomadaires affichées" msgstr "Nouvelles hebdomadaires affichées"
=======
msgstr ""
>>>>>>> Free subscription for jewels
#: com/templates/com/news_admin_list.jinja:84 #: com/templates/com/news_admin_list.jinja:84
#: com/templates/com/news_admin_list.jinja:124 #: com/templates/com/news_admin_list.jinja:124
...@@ -1453,8 +1471,15 @@ msgid "Dates" ...@@ -1453,8 +1471,15 @@ msgid "Dates"
msgstr "Dates" msgstr "Dates"
#: com/templates/com/news_admin_list.jinja:115 #: com/templates/com/news_admin_list.jinja:115
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
msgid "Weeklies to moderate" msgid "Weeklies to moderate"
msgstr "Nouvelles hebdomadaires à modérer" msgstr "Nouvelles hebdomadaires à modérer"
=======
#, fuzzy
#| msgid "New files to be moderated"
msgid "Weeklies to moderate"
msgstr "Nouveaux fichiers à modérer"
>>>>>>> Free subscription for jewels
#: com/templates/com/news_admin_list.jinja:156 #: com/templates/com/news_admin_list.jinja:156
msgid "Calls" msgid "Calls"
...@@ -1462,11 +1487,21 @@ msgstr "Appels" ...@@ -1462,11 +1487,21 @@ msgstr "Appels"
#: com/templates/com/news_admin_list.jinja:158 #: com/templates/com/news_admin_list.jinja:158
msgid "Displayed calls" msgid "Displayed calls"
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
msgstr "Appels affichés" msgstr "Appels affichés"
#: com/templates/com/news_admin_list.jinja:193 #: com/templates/com/news_admin_list.jinja:193
msgid "Calls to moderate" msgid "Calls to moderate"
msgstr "Appels à modérer" msgstr "Appels à modérer"
=======
msgstr ""
#: com/templates/com/news_admin_list.jinja:193
#, fuzzy
#| msgid "is moderated"
msgid "Calls to moderate"
msgstr "est modéré"
>>>>>>> Free subscription for jewels
#: com/templates/com/news_admin_list.jinja:228 #: com/templates/com/news_admin_list.jinja:228
msgid "Events" msgid "Events"
...@@ -1474,11 +1509,21 @@ msgstr "Événements" ...@@ -1474,11 +1509,21 @@ msgstr "Événements"
#: com/templates/com/news_admin_list.jinja:230 #: com/templates/com/news_admin_list.jinja:230
msgid "Displayed events" msgid "Displayed events"
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
msgstr "Événements affichés" msgstr "Événements affichés"
#: com/templates/com/news_admin_list.jinja:265 #: com/templates/com/news_admin_list.jinja:265
msgid "Events to moderate" msgid "Events to moderate"
msgstr "Événements à modérer" msgstr "Événements à modérer"
=======
msgstr ""
#: com/templates/com/news_admin_list.jinja:265
#, fuzzy
#| msgid "is moderated"
msgid "Events to moderate"
msgstr "est modéré"
>>>>>>> Free subscription for jewels
#: com/templates/com/news_detail.jinja:10 #: com/templates/com/news_detail.jinja:10
msgid "Back to news" msgid "Back to news"
...@@ -4077,12 +4122,20 @@ msgid "Washing and drying" ...@@ -4077,12 +4122,20 @@ msgid "Washing and drying"
msgstr "Lavage et séchage" msgstr "Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27 #: launderette/templates/launderette/launderette_book.jinja:27
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
#: sith/settings.py:541 #: sith/settings.py:541
=======
#: sith/settings.py:544
>>>>>>> Free subscription for jewels
msgid "Washing" msgid "Washing"
msgstr "Lavage" msgstr "Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31 #: launderette/templates/launderette/launderette_book.jinja:31
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
#: sith/settings.py:541 #: sith/settings.py:541
=======
#: sith/settings.py:544
>>>>>>> Free subscription for jewels
msgid "Drying" msgid "Drying"
msgstr "Séchage" msgstr "Séchage"
...@@ -4387,8 +4440,9 @@ msgstr "Membre de Sbarro ou de l'ESTA, 15 €" ...@@ -4387,8 +4440,9 @@ msgstr "Membre de Sbarro ou de l'ESTA, 15 €"
#: sith/settings.py:483 #: sith/settings.py:483
msgid "One semester Welcome Week" msgid "One semester Welcome Week"
msgstr "Un semestre - Welcome Week 0 €" msgstr "Un semestre Welcome Week"
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
#: sith/settings.py:505 #: sith/settings.py:505
msgid "President" msgid "President"
msgstr "Président" msgstr "Président"
...@@ -4422,6 +4476,45 @@ msgid "Active member" ...@@ -4422,6 +4476,45 @@ msgid "Active member"
msgstr "Membre actif" msgstr "Membre actif"
#: sith/settings.py:513 #: sith/settings.py:513
=======
#: sith/settings.py:487
msgid "Two month for free"
msgstr "Deux mois gratuits"
#: sith/settings.py:509
msgid "President"
msgstr "Président"
#: sith/settings.py:510
msgid "Vice-President"
msgstr "Vice-Président"
#: sith/settings.py:511
msgid "Treasurer"
msgstr "Trésorier"
#: sith/settings.py:512
msgid "Communication supervisor"
msgstr "Responsable communication"
#: sith/settings.py:513
msgid "Secretary"
msgstr "Secrétaire"
#: sith/settings.py:514
msgid "IT supervisor"
msgstr "Responsable info"
#: sith/settings.py:515
msgid "Board member"
msgstr "Membre du bureau"
#: sith/settings.py:516
msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:517
>>>>>>> Free subscription for jewels
msgid "Curious" msgid "Curious"
msgstr "Curieux" msgstr "Curieux"
...@@ -4445,12 +4538,22 @@ msgstr "Nouvelles photos/albums à modérer dans le SAS" ...@@ -4445,12 +4538,22 @@ msgstr "Nouvelles photos/albums à modérer dans le SAS"
msgid "You've been identified on some pictures" msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos" msgstr "Vous avez été identifié sur des photos"
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
#: sith/settings.py:553 #: sith/settings.py:553
=======
#: sith/settings.py:551
>>>>>>> Free subscription for jewels
#, python-format #, python-format
msgid "You just refilled of %s €" msgid "You just refilled of %s €"
msgstr "Vous avez rechargé votre compte de %s €" msgstr "Vous avez rechargé votre compte de %s €"
<<<<<<< 02b317eee8b9274ad44a74856c412b3a2a0e8eda
#: sith/settings.py:554 #: sith/settings.py:554
=======
#: sith/settings.py:552
#: sith/settings.py:556
>>>>>>> Free subscription for jewels
#, python-format #, python-format
msgid "You just bought %s" msgid "You just bought %s"
msgstr "Vous avez acheté %s" msgstr "Vous avez acheté %s"
......
...@@ -484,6 +484,11 @@ SITH_SUBSCRIPTIONS = { ...@@ -484,6 +484,11 @@ SITH_SUBSCRIPTIONS = {
'price': 0, 'price': 0,
'duration': 1, 'duration': 1,
}, },
'deux-mois-pour-bijoux': {
'name': _('Two month for free'),
'price': 0,
'duration': 0.34,
}
# To be completed.... # To be completed....
} }
......
...@@ -104,6 +104,7 @@ class Subscription(models.Model): ...@@ -104,6 +104,7 @@ class Subscription(models.Model):
'sbarro/esta': 9, 'sbarro/esta': 9,
'cursus-alternant': 10, 'cursus-alternant': 10,
'welcome-semestre': 11, 'welcome-semestre': 11,
'un-mois': 12,
} }
PAYMENT = { PAYMENT = {
"CHECK": 1, "CHECK": 1,
...@@ -168,11 +169,11 @@ class Subscription(models.Model): ...@@ -168,11 +169,11 @@ class Subscription(models.Model):
start = Subscription.compute_start(duration=duration) start = Subscription.compute_start(duration=duration)
# This can certainly be simplified, but it works like this # This can certainly be simplified, but it works like this
try: try:
return start.replace(month=(start.month - 1 + 6 * duration) % 12 + 1, return start.replace(month=int((start.month - 1 + 6 * duration) % 12 + 1),
year=start.year + int(duration / 2) + (1 if start.month > 6 and duration % 2 == 1 else 0)) year=int(start.year + int(duration / 2) + (1 if start.month > 6 and duration % 2 == 1 else 0)))
except ValueError as e: except ValueError as e:
return start.replace(day=1, month=(start.month + 6 * duration) % 12 + 1, return start.replace(day=1, month=int((start.month + 6 * duration) % 12 + 1),
year=start.year + int(duration / 2) + (1 if start.month > 6 and duration % 2 == 1 else 0)) year=int(start.year + int(duration / 2) + (1 if start.month > 6 and duration % 2 == 1 else 0)))
def can_be_edited_by(self, user): def can_be_edited_by(self, user):
return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment