Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
1da8ccf6
Commit
1da8ccf6
authored
Dec 08, 2020
by
Och
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added new subscription for the new CA offer
parent
aaf1adaa
Pipeline
#2232
failed with stage
in 31 minutes and 14 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
94 additions
and
35 deletions
+94
-35
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+41
-35
sith/settings.py
sith/settings.py
+6
-0
subscription/migrations/0014_auto_20201207_2323.py
subscription/migrations/0014_auto_20201207_2323.py
+47
-0
No files found.
locale/fr/LC_MESSAGES/django.po
View file @
1da8ccf6
...
...
@@ -6,7 +6,7 @@
msgid
""
msgstr
""
"Report-Msgid-Bugs-To:
\n
"
"POT-Creation-Date: 2020-
06-15 19:39
+0
2
00
\n
"
"POT-Creation-Date: 2020-
12-07 23:23
+0
1
00
\n
"
"PO-Revision-Date: 2016-07-18
\n
"
"Last-Translator: Skia <skia@libskia.so>
\n
"
"Language-Team: AE info <ae.info@utbm.fr>
\n
"
...
...
@@ -4755,12 +4755,12 @@ msgid "Washing and drying"
msgstr
"Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27
#: sith/settings.py:
593
#: sith/settings.py:
600
msgid
"Washing"
msgstr
"Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:
594
#: sith/settings.py:
600
msgid
"Drying"
msgstr
"Séchage"
...
...
@@ -5487,7 +5487,9 @@ msgid "Two months for free"
msgstr
"Deux mois gratuits"
#: sith/settings.py:502
msgid
"Eurock's volunteer"
#, fuzzy
#| msgid "Eurock's volunteer"
msgid
"Eurok's volunteer"
msgstr
"Bénévole Eurockéennes"
#: sith/settings.py:504
...
...
@@ -5498,132 +5500,136 @@ msgstr "6 semaines gratuites"
msgid
"One day"
msgstr
"Un jour"
#: sith/settings.py:50
8
#: sith/settings.py:50
9
msgid
"GA staff member"
msgstr
"Membre staff GA (2 semaines), 1 €"
#: sith/settings.py:51
1
#: sith/settings.py:51
2
msgid
"One semester (-20%)"
msgstr
"Un semestre (-20%), 12 €"
#: sith/settings.py:51
6
#: sith/settings.py:51
7
msgid
"Two semesters (-20%)"
msgstr
"Deux semestres (-20%), 22 €"
#: sith/settings.py:52
1
#: sith/settings.py:52
2
msgid
"Common core cursus (-20%)"
msgstr
"Cursus tronc commun (-20%), 36 €"
#: sith/settings.py:52
6
#: sith/settings.py:52
7
msgid
"Branch cursus (-20%)"
msgstr
"Cursus branche (-20%), 36 €"
#: sith/settings.py:53
1
#: sith/settings.py:53
2
msgid
"Alternating cursus (-20%)"
msgstr
"Cursus alternant (-20%), 24 €"
#: sith/settings.py:553
#: sith/settings.py:538
msgid
"One year for free(CA offer)"
msgstr
"Une année offerte (Offre CA)"
#: sith/settings.py:560
msgid
"President"
msgstr
"Président"
#: sith/settings.py:5
54
#: sith/settings.py:5
61
msgid
"Vice-President"
msgstr
"Vice-Président"
#: sith/settings.py:5
55
#: sith/settings.py:5
62
msgid
"Treasurer"
msgstr
"Trésorier"
#: sith/settings.py:5
5
6
#: sith/settings.py:56
3
msgid
"Communication supervisor"
msgstr
"Responsable communication"
#: sith/settings.py:5
57
#: sith/settings.py:5
64
msgid
"Secretary"
msgstr
"Secrétaire"
#: sith/settings.py:55
8
#: sith/settings.py:5
6
5
msgid
"IT supervisor"
msgstr
"Responsable info"
#: sith/settings.py:5
59
#: sith/settings.py:5
66
msgid
"Board member"
msgstr
"Membre du bureau"
#: sith/settings.py:56
0
#: sith/settings.py:56
7
msgid
"Active member"
msgstr
"Membre actif"
#: sith/settings.py:56
1
#: sith/settings.py:56
8
msgid
"Curious"
msgstr
"Curieux"
#: sith/settings.py:
597
#: sith/settings.py:
604
msgid
"A new poster needs to be moderated"
msgstr
"Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:
598
#: sith/settings.py:
605
msgid
"A new mailing list needs to be moderated"
msgstr
"Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:60
2
#: sith/settings.py:60
8
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:60
4
#: sith/settings.py:6
1
0
#, 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:6
05
#: sith/settings.py:6
11
msgid
"New files to be moderated"
msgstr
"Nouveaux fichiers à modérer"
#: sith/settings.py:6
06
#: sith/settings.py:6
12
#, 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:6
07
#: sith/settings.py:6
13
msgid
"You've been identified on some pictures"
msgstr
"Vous avez été identifié sur des photos"
#: sith/settings.py:6
08
#: sith/settings.py:6
14
#, python-format
msgid
"You just refilled of %s €"
msgstr
"Vous avez rechargé votre compte de %s€"
#: sith/settings.py:6
09
#: sith/settings.py:6
15
#, python-format
msgid
"You just bought %s"
msgstr
"Vous avez acheté %s"
#: sith/settings.py:61
0
#: sith/settings.py:61
6
msgid
"You have a notification"
msgstr
"Vous avez une notification"
#: sith/settings.py:62
1
#: sith/settings.py:62
8
msgid
"Success!"
msgstr
"Succès !"
#: sith/settings.py:62
2
#: sith/settings.py:62
9
msgid
"Fail!"
msgstr
"Échec !"
#: sith/settings.py:6
2
3
#: sith/settings.py:63
0
msgid
"You successfully posted an article in the Weekmail"
msgstr
"Article posté avec succès dans le Weekmail"
#: sith/settings.py:6
24
#: sith/settings.py:6
31
msgid
"You successfully edited an article in the Weekmail"
msgstr
"Article édité avec succès dans le Weekmail"
#: sith/settings.py:62
5
#: sith/settings.py:6
3
2
msgid
"You successfully sent the Weekmail"
msgstr
"Weekmail envoyé avec succès"
#: sith/settings.py:6
33
#: sith/settings.py:6
40
msgid
"AE tee-shirt"
msgstr
"Tee-shirt AE"
...
...
sith/settings.py
View file @
1da8ccf6
...
...
@@ -532,6 +532,12 @@ SITH_SUBSCRIPTIONS = {
"name"
:
_
(
"Alternating cursus (-20%)"
),
"price"
:
24
,
"duration"
:
6
,
},
# CA special offer
"un-an-offert-CA"
:
{
"name"
:
_
(
"One year for free(CA offer)"
),
"price"
:
0
,
"duration"
:
2
,
}
# To be completed....
}
...
...
subscription/migrations/0014_auto_20201207_2323.py
0 → 100644
View file @
1da8ccf6
# Generated by Django 2.2.17 on 2020-12-07 22:23
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
"subscription"
,
"0013_auto_20200828_2117"
),
]
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-an-offert-CA"
,
"One year for free(CA offer)"
),
(
"un-jour"
,
"One day"
),
(
"un-mois-essai"
,
"One month for free"
),
(
"un-semestre"
,
"One semester"
),
(
"un-semestre-reduction"
,
"One semester (-20%)"
),
(
"un-semestre-welcome"
,
"One semester Welcome Week"
),
],
max_length
=
255
,
verbose_name
=
"subscription type"
,
),
),
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment