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
f4851784
Commit
f4851784
authored
Jun 18, 2020
by
Sli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'och' into 'master'
settings: Added a new subscription See merge request
!274
parents
390a4b00
797ca0f9
Pipeline
#2203
passed with stage
in 31 minutes and 10 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
84 additions
and
34 deletions
+84
-34
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+38
-34
sith/settings.py
sith/settings.py
+1
-0
subscription/migrations/0012_auto_20200615_1438.py
subscription/migrations/0012_auto_20200615_1438.py
+45
-0
No files found.
locale/fr/LC_MESSAGES/django.po
View file @
f4851784
...
...
@@ -6,7 +6,7 @@
msgid
""
msgstr
""
"Report-Msgid-Bugs-To:
\n
"
"POT-Creation-Date: 2020-0
3-22 16:12
+0
1
00
\n
"
"POT-Creation-Date: 2020-0
6-15 19:39
+0
2
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
"
...
...
@@ -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:6
3
#: sas/templates/sas/picture.jinja:95 trombi/views.py:6
1
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:59
2
#: sith/settings.py:59
3
msgid
"Washing"
msgstr
"Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:59
2
#: sith/settings.py:59
3
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:51
5
#: sith/settings.py:51
6
msgid
"Two semesters (-20%)"
msgstr
"Deux semestres (-20%), 22 €"
#: sith/settings.py:52
0
#: sith/settings.py:52
1
msgid
"Common core cursus (-20%)"
msgstr
"Cursus tronc commun (-20%), 36 €"
#: sith/settings.py:52
5
#: sith/settings.py:52
6
msgid
"Branch cursus (-20%)"
msgstr
"Cursus branche (-20%), 36 €"
#: sith/settings.py:53
0
#: sith/settings.py:53
1
msgid
"Alternating cursus (-20%)"
msgstr
"Cursus alternant (-20%), 24 €"
#: sith/settings.py:55
2
#: sith/settings.py:55
3
msgid
"President"
msgstr
"Président"
#: sith/settings.py:55
3
#: sith/settings.py:55
4
msgid
"Vice-President"
msgstr
"Vice-Président"
#: sith/settings.py:55
4
#: sith/settings.py:55
5
msgid
"Treasurer"
msgstr
"Trésorier"
#: sith/settings.py:55
5
#: sith/settings.py:55
6
msgid
"Communication supervisor"
msgstr
"Responsable communication"
#: sith/settings.py:55
6
#: sith/settings.py:55
7
msgid
"Secretary"
msgstr
"Secrétaire"
#: sith/settings.py:55
7
#: sith/settings.py:55
8
msgid
"IT supervisor"
msgstr
"Responsable info"
#: sith/settings.py:55
8
#: sith/settings.py:55
9
msgid
"Board member"
msgstr
"Membre du bureau"
#: sith/settings.py:5
59
#: sith/settings.py:5
60
msgid
"Active member"
msgstr
"Membre actif"
#: sith/settings.py:56
0
#: sith/settings.py:56
1
msgid
"Curious"
msgstr
"Curieux"
#: sith/settings.py:59
6
#: sith/settings.py:59
7
msgid
"A new poster needs to be moderated"
msgstr
"Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:59
7
#: sith/settings.py:59
8
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
0
#: sith/settings.py:60
1
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
2
#: sith/settings.py:60
3
#, 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:60
3
#: sith/settings.py:60
4
msgid
"New files to be moderated"
msgstr
"Nouveaux fichiers à modérer"
#: sith/settings.py:60
4
#: sith/settings.py:60
5
#, 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:60
5
#: sith/settings.py:60
6
msgid
"You've been identified on some pictures"
msgstr
"Vous avez été identifié sur des photos"
#: sith/settings.py:60
6
#: sith/settings.py:60
7
#, python-format
msgid
"You just refilled of %s €"
msgstr
"Vous avez rechargé votre compte de %s€"
#: sith/settings.py:60
7
#: sith/settings.py:60
8
#, python-format
msgid
"You just bought %s"
msgstr
"Vous avez acheté %s"
#: sith/settings.py:60
8
#: sith/settings.py:60
9
msgid
"You have a notification"
msgstr
"Vous avez une notification"
#: sith/settings.py:62
0
#: sith/settings.py:62
1
msgid
"Success!"
msgstr
"Succès !"
#: sith/settings.py:62
1
#: sith/settings.py:62
2
msgid
"Fail!"
msgstr
"Échec !"
#: sith/settings.py:62
2
#: sith/settings.py:62
3
msgid
"You successfully posted an article in the Weekmail"
msgstr
"Article posté avec succès dans le Weekmail"
#: sith/settings.py:62
3
#: sith/settings.py:62
4
msgid
"You successfully edited an article in the Weekmail"
msgstr
"Article édité avec succès dans le Weekmail"
#: sith/settings.py:62
4
#: sith/settings.py:62
5
msgid
"You successfully sent the Weekmail"
msgstr
"Weekmail envoyé avec succès"
#: sith/settings.py:63
2
#: sith/settings.py:63
3
msgid
"AE tee-shirt"
msgstr
"Tee-shirt AE"
...
...
sith/settings.py
View file @
f4851784
...
...
@@ -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
0 → 100644
View file @
f4851784
# 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"
,
),
),
]
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