From 57b663c4c526c295ff40a30637d48690b0d0c0c3 Mon Sep 17 00:00:00 2001 From: guillaume-renaud Date: Wed, 26 Oct 2016 15:06:00 +0200 Subject: [PATCH] counter inactive state with settings variable, traduction file problem fixed --- counter/models.py | 7 +- counter/templates/counter/activity.jinja | 5 +- locale/fr/LC_MESSAGES/django.mo | Bin 37453 -> 37407 bytes locale/fr/LC_MESSAGES/django.po | 331 ++++++++++++++++------- sith/settings.py | 4 +- 5 files changed, 237 insertions(+), 110 deletions(-) diff --git a/counter/models.py b/counter/models.py index 038a546a..af6b89f5 100644 --- a/counter/models.py +++ b/counter/models.py @@ -223,12 +223,9 @@ class Counter(models.Model): def is_inactive(self): """ - Returns True if the counter self is inactive from 10 minutes, else False + Returns True if the counter self is inactive from SITH_COUNTER_MINUTE_INACTIVE's value minutes, else False """ - if (self.is_open()): - return ((timezone.now() - self.permanencies.model.objects.order_by('-activity').first().activity) > datetime.timedelta(minutes=10)) - else: - return False + return self.is_open() and ((timezone.now() - self.permanencies.order_by('-activity').first().activity) > datetime.timedelta(minutes=settings.SITH_COUNTER_MINUTE_INACTIVE)) def barman_list(self): """ diff --git a/counter/templates/counter/activity.jinja b/counter/templates/counter/activity.jinja index 65d5a8e3..08e405ff 100644 --- a/counter/templates/counter/activity.jinja +++ b/counter/templates/counter/activity.jinja @@ -16,11 +16,10 @@ {% endif %} - -
{% trans %}Legend{% endtrans %}
+
{% trans %}Legend{% endtrans %}
✓ : {% trans %}counter is open, there's at least one barman connected{% endtrans %}
- ? : {% trans %}counter is open but not active, the last sale was done at least 10 minutes ago {% endtrans %} + ? : {% trans minutes=settings.SITH_COUNTER_MINUTE_INACTIVE %}counter is open but not active, the last sale was done at least {{ minutes }} minutes ago {% endtrans %}
✗ : {% trans %}counter is not open : no one is connected{% endtrans %} {% endblock %} diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 896b8e1ebbb385c7c163b83f8bd0ff78c8593731..10e890a15f31e07dab01fcc6a902698573d60ce6 100644 GIT binary patch delta 13972 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 delta 14008 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\n" "Language-Team: AE info \n" @@ -85,12 +85,12 @@ msgstr "Compte club" msgid "%(club_account)s on %(bank_account)s" msgstr "%(club_account)s sur %(bank_account)s" -#: accounting/models.py:142 club/models.py:146 counter/models.py:380 +#: accounting/models.py:139 club/models.py:146 counter/models.py:348 #: launderette/models.py:122 msgid "start date" msgstr "date de début" -#: accounting/models.py:143 club/models.py:147 counter/models.py:381 +#: accounting/models.py:140 club/models.py:147 counter/models.py:349 msgid "end date" msgstr "date de fin" @@ -102,8 +102,8 @@ msgstr "est fermé" msgid "club account" msgstr "compte club" -#: accounting/models.py:147 accounting/models.py:193 counter/models.py:28 -#: counter/models.py:234 +#: accounting/models.py:144 accounting/models.py:190 counter/models.py:28 +#: counter/models.py:233 msgid "amount" msgstr "montant" @@ -123,17 +123,17 @@ msgstr "numéro" msgid "journal" msgstr "classeur" -#: accounting/models.py:194 core/models.py:498 core/models.py:778 -#: counter/models.py:237 counter/models.py:280 counter/models.py:397 +#: accounting/models.py:191 core/models.py:495 core/models.py:773 +#: counter/models.py:236 counter/models.py:279 counter/models.py:365 #: eboutic/models.py:15 eboutic/models.py:48 msgid "date" msgstr "date" -#: accounting/models.py:195 counter/models.py:398 +#: accounting/models.py:192 counter/models.py:366 msgid "comment" msgstr "commentaire" -#: accounting/models.py:196 counter/models.py:238 counter/models.py:281 +#: accounting/models.py:193 counter/models.py:237 counter/models.py:280 #: subscription/models.py:57 msgid "payment method" msgstr "méthode de paiement" @@ -158,8 +158,8 @@ msgstr "type simplifié" msgid "accounting type" msgstr "type comptable" -#: accounting/models.py:205 accounting/models.py:299 accounting/models.py:325 -#: accounting/models.py:348 counter/models.py:272 +#: accounting/models.py:202 accounting/models.py:296 accounting/models.py:322 +#: accounting/models.py:345 counter/models.py:271 msgid "label" msgstr "intitulé" @@ -167,7 +167,7 @@ msgstr "intitulé" msgid "target type" msgstr "type de cible" -#: accounting/models.py:207 club/templates/club/club_members.jinja:8 +#: accounting/models.py:204 club/templates/club/club_members.jinja:8 #: club/templates/club/club_old_members.jinja:8 #: core/templates/core/user_clubs.jinja:15 #: core/templates/core/user_clubs.jinja:41 @@ -177,7 +177,7 @@ msgstr "type de cible" msgid "User" msgstr "Utilisateur" -#: accounting/models.py:207 club/templates/club/club_detail.jinja:5 +#: accounting/models.py:204 club/templates/club/club_detail.jinja:5 #: counter/templates/counter/invoices_call.jinja:20 msgid "Club" msgstr "Club" @@ -190,7 +190,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:207 sith/settings.py:291 +#: accounting/models.py:204 sith/settings.py:290 msgid "Other" msgstr "Autre" @@ -303,7 +303,7 @@ msgstr "Compte en banque : " #: accounting/templates/accounting/bank_account_details.jinja:15 #: accounting/templates/accounting/club_account_details.jinja:16 #: accounting/templates/accounting/label_list.jinja:21 -#: club/templates/club/club_sellings.jinja:53 +#: club/templates/club/club_sellings.jinja:48 #: core/templates/core/file_detail.jinja:43 #: core/templates/core/group_list.jinja:13 core/templates/core/macros.jinja:66 #: core/templates/core/user_account_detail.jinja:38 @@ -316,7 +316,7 @@ msgid "Delete" msgstr "Supprimer" #: accounting/templates/accounting/bank_account_details.jinja:17 -#: club/views.py:32 core/views/user.py:130 +#: club/views.py:31 core/views/user.py:130 msgid "Infos" msgstr "Infos" @@ -335,7 +335,7 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/bank_account_details.jinja:26 #: accounting/templates/accounting/bank_account_list.jinja:21 #: accounting/templates/accounting/club_account_details.jinja:55 -#: accounting/templates/accounting/journal_details.jinja:70 club/views.py:54 +#: accounting/templates/accounting/journal_details.jinja:70 club/views.py:53 #: core/templates/core/file.jinja:38 core/templates/core/page.jinja:31 #: core/templates/core/user_tools.jinja:36 core/views/user.py:147 #: counter/templates/counter/cash_summary_list.jinja:53 @@ -472,7 +472,7 @@ msgid "Nb" msgstr "No" #: accounting/templates/accounting/journal_details.jinja:29 -#: club/templates/club/club_sellings.jinja:23 +#: club/templates/club/club_sellings.jinja:18 #: core/templates/core/user_account_detail.jinja:17 #: core/templates/core/user_account_detail.jinja:50 #: core/templates/core/user_account_detail.jinja:79 @@ -483,7 +483,7 @@ msgid "Date" msgstr "Date" #: accounting/templates/accounting/journal_details.jinja:30 -#: club/templates/club/club_sellings.jinja:27 +#: club/templates/club/club_sellings.jinja:22 #: core/templates/core/user_account_detail.jinja:20 #: counter/templates/counter/last_ops.jinja:42 msgid "Label" @@ -588,7 +588,7 @@ msgstr "Vous ne pouvez pas faire de boucles dans les clubs" msgid "A club with that unix_name already exists" msgstr "Un club avec ce nom UNIX existe déjà." -#: club/models.py:144 counter/models.py:378 counter/models.py:395 +#: club/models.py:144 counter/models.py:346 counter/models.py:363 #: eboutic/models.py:14 eboutic/models.py:47 launderette/models.py:89 #: launderette/models.py:126 msgid "user" @@ -677,6 +677,120 @@ msgstr "Du" msgid "To" msgstr "Au" +#: club/templates/club/club_sellings.jinja:5 club/views.py:58 +#: counter/templates/counter/counter_main.jinja:19 +#: counter/templates/counter/last_ops.jinja:35 +msgid "Sellings" +msgstr "Ventes" + +#: club/templates/club/club_sellings.jinja:9 +#: counter/templates/counter/cash_summary_list.jinja:15 +msgid "Show" +msgstr "Montrer" + +#: club/templates/club/club_sellings.jinja:12 +msgid "Quantity: " +msgstr "Quantité : " + +#: club/templates/club/club_sellings.jinja:12 +msgid "units" +msgstr "unités" + +#: club/templates/club/club_sellings.jinja:13 +#: counter/templates/counter/counter_click.jinja:70 +#: counter/templates/counter/counter_main.jinja:28 +#: eboutic/templates/eboutic/eboutic_main.jinja:34 +msgid "Total: " +msgstr "Total : " + +#: club/templates/club/club_sellings.jinja:19 club/views.py:165 +#: core/templates/core/user_account_detail.jinja:18 +#: core/templates/core/user_account_detail.jinja:51 +#: counter/templates/counter/cash_summary_list.jinja:33 counter/views.py:78 +msgid "Counter" +msgstr "Comptoir" + +#: club/templates/club/club_sellings.jinja:20 +#: core/templates/core/user_account_detail.jinja:19 +#: core/templates/core/user_account_detail.jinja:52 +#: counter/templates/counter/last_ops.jinja:15 +#: counter/templates/counter/last_ops.jinja:40 +msgid "Barman" +msgstr "Barman" + +#: club/templates/club/club_sellings.jinja:21 +#: counter/templates/counter/counter_click.jinja:29 +#: counter/templates/counter/last_ops.jinja:16 +#: counter/templates/counter/last_ops.jinja:41 +msgid "Customer" +msgstr "Client" + +#: club/templates/club/club_sellings.jinja:23 +#: core/templates/core/user_account_detail.jinja:21 +#: core/templates/core/user_stats.jinja:28 +#: counter/templates/counter/last_ops.jinja:43 +msgid "Quantity" +msgstr "Quantité" + +#: club/templates/club/club_sellings.jinja:24 +#: core/templates/core/user_account.jinja:10 +#: core/templates/core/user_account_detail.jinja:22 +#: counter/templates/counter/cash_summary_list.jinja:35 +#: counter/templates/counter/last_ops.jinja:44 +#: counter/templates/counter/stats.jinja:18 +msgid "Total" +msgstr "Total" + +#: club/templates/club/club_sellings.jinja:25 +#: core/templates/core/user_account_detail.jinja:23 +#: core/templates/core/user_account_detail.jinja:54 +#: counter/templates/counter/last_ops.jinja:18 +#: counter/templates/counter/last_ops.jinja:45 +msgid "Payment method" +msgstr "Méthode de paiement" + +#: club/templates/club/club_tools.jinja:4 +#: core/templates/core/user_tools.jinja:62 +msgid "Club tools" +msgstr "Outils club" + +#: club/templates/club/club_tools.jinja:6 +msgid "Counters:" +msgstr "Comptoirs : " + +#: club/templates/club/club_tools.jinja:22 +msgid "Accouting: " +msgstr "Comptabilité : " + +#: club/templates/club/club_tools.jinja:30 +msgid "Manage launderettes" +msgstr "Gestion des laveries" + +#: club/templates/club/club_members.jinja:21 +#: core/templates/core/user_clubs.jinja:29 +msgid "Mark as old" +msgstr "Marquer comme ancien" + +#: club/templates/club/club_members.jinja:30 +#: core/templates/core/file_detail.jinja:19 core/views/forms.py:203 +#: launderette/views.py:146 +msgid "Add" +msgstr "Ajouter" + +#: club/templates/club/club_old_members.jinja:5 +msgid "Club old members" +msgstr "Anciens membres du club" + +#: club/templates/club/club_old_members.jinja:11 +#: core/templates/core/user_clubs.jinja:44 +msgid "From" +msgstr "Du" + +#: club/templates/club/club_old_members.jinja:12 +#: core/templates/core/user_clubs.jinja:45 +msgid "To" +msgstr "Au" + #: club/templates/club/club_sellings.jinja:5 club/views.py:59 #: counter/templates/counter/counter_main.jinja:19 #: counter/templates/counter/last_ops.jinja:35 @@ -778,11 +892,11 @@ msgstr "Membres" msgid "Old members" msgstr "Anciens membres" -#: club/views.py:49 core/templates/core/base.jinja:40 core/views/user.py:141 +#: club/views.py:48 core/templates/core/base.jinja:42 core/views/user.py:141 msgid "Tools" msgstr "Outils" -#: club/views.py:65 counter/templates/counter/counter_list.jinja:21 +#: club/views.py:64 counter/templates/counter/counter_list.jinja:21 #: counter/templates/counter/counter_list.jinja:36 #: counter/templates/counter/counter_list.jinja:51 msgid "Props" @@ -800,7 +914,7 @@ msgstr "Date de début" msgid "End date" msgstr "Date de fin" -#: club/views.py:179 core/templates/core/user_stats.jinja:27 +#: club/views.py:178 core/templates/core/user_stats.jinja:27 #: counter/views.py:990 msgid "Product" msgstr "Produit" @@ -1084,7 +1198,7 @@ msgstr "profil visible par les cotisants" msgid "A user with that username already exists" msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" -#: core/models.py:417 core/templates/core/macros.jinja:17 +#: core/models.py:414 core/templates/core/macros.jinja:17 #: core/templates/core/user_detail.jinja:14 #: core/templates/core/user_detail.jinja:16 #: core/templates/core/user_edit.jinja:16 @@ -1264,12 +1378,12 @@ msgstr "Forum" msgid "Services" msgstr "Services" -#: core/templates/core/base.jinja:72 core/templates/core/file.jinja:20 +#: core/templates/core/base.jinja:74 core/templates/core/file.jinja:20 #: core/views/files.py:47 msgid "Files" msgstr "Fichiers" -#: core/templates/core/base.jinja:73 +#: core/templates/core/base.jinja:75 msgid "Sponsors" msgstr "Partenaires" @@ -1690,7 +1804,7 @@ msgstr "Facture eboutic" #: core/templates/core/user_account.jinja:53 counter/views.py:479 msgid "Etickets" -msgstr "Etickets" +msgstr "" #: core/templates/core/user_account.jinja:64 #: core/templates/core/user_account_detail.jinja:103 @@ -2015,7 +2129,7 @@ msgstr "groupe d'achat" msgid "archived" msgstr "archivé" -#: counter/models.py:113 counter/models.py:478 +#: counter/models.py:106 counter/models.py:446 msgid "product" msgstr "produit" @@ -2040,7 +2154,7 @@ msgstr "Bureau" #: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 -#: sith/settings.py:290 sith/settings.py:298 +#: sith/settings.py:289 sith/settings.py:297 msgid "Eboutic" msgstr "Eboutic" @@ -2052,107 +2166,89 @@ msgstr "vendeurs" msgid "token" msgstr "jeton" -#: counter/models.py:142 counter/models.py:379 counter/models.py:396 +#: counter/models.py:135 counter/models.py:347 counter/models.py:364 #: launderette/models.py:16 msgid "counter" msgstr "comptoir" -#: counter/models.py:240 +#: counter/models.py:239 msgid "bank" msgstr "banque" -#: counter/models.py:242 counter/models.py:283 +#: counter/models.py:241 counter/models.py:282 msgid "is validated" msgstr "est validé" -#: counter/models.py:245 +#: counter/models.py:244 msgid "refilling" msgstr "rechargement" -#: counter/models.py:276 eboutic/models.py:103 +#: counter/models.py:275 eboutic/models.py:103 msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:277 counter/models.py:468 eboutic/models.py:104 +#: counter/models.py:276 counter/models.py:436 eboutic/models.py:104 msgid "quantity" msgstr "quantité" -#: counter/models.py:282 +#: counter/models.py:281 msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:282 sith/settings.py:283 sith/settings.py:288 -#: sith/settings.py:310 +#: counter/models.py:281 sith/settings.py:282 sith/settings.py:287 +#: sith/settings.py:309 msgid "Credit card" msgstr "Carte bancaire" -#: counter/models.py:286 +#: counter/models.py:285 msgid "selling" msgstr "vente" -#: counter/models.py:304 -msgid "Unknown event" -msgstr "Événement inconnu" - -#: counter/models.py:305 -#, python-format -msgid "Eticket bought for the event %(event)s" -msgstr "Eticket acheté pour l'événement %(event)s" - -#: counter/models.py:307 counter/models.py:319 -#, python-format -msgid "" -"You bought an eticket for the event %(event)s.\n" -"You can download it on this page %(url)s." -msgstr "" -"Vous avez acheté un Eticket pour l'événement %(event)s.\n" -"Vous pouvez le télécharger sur cette page: %(url)s" - -#: counter/models.py:382 +#: counter/models.py:350 msgid "last activity date" msgstr "dernière activité" -#: counter/models.py:385 +#: counter/models.py:353 msgid "permanency" msgstr "permanence" -#: counter/models.py:399 +#: counter/models.py:367 msgid "emptied" msgstr "coffre vidée" -#: counter/models.py:402 +#: counter/models.py:370 msgid "cash register summary" msgstr "relevé de caisse" -#: counter/models.py:466 +#: counter/models.py:434 msgid "cash summary" msgstr "relevé" -#: counter/models.py:467 +#: counter/models.py:435 msgid "value" msgstr "valeur" -#: counter/models.py:469 +#: counter/models.py:437 msgid "check" msgstr "chèque" -#: counter/models.py:472 +#: counter/models.py:440 msgid "cash register summary item" msgstr "élément de relevé de caisse" -#: counter/models.py:479 +#: counter/models.py:447 msgid "banner" msgstr "bannière" -#: counter/models.py:480 +#: counter/models.py:448 msgid "event date" msgstr "date de l'événement" -#: counter/models.py:481 +#: counter/models.py:449 msgid "event title" msgstr "titre de l'événement" -#: counter/models.py:482 +#: counter/models.py:450 msgid "secret" msgstr "secret" @@ -2166,6 +2262,26 @@ msgstr "Activité sur %(counter_name)s" msgid "Barman list" msgstr "Barmans" +#: counter/templates/counter/activity.jinja:19 +msgid "Legend" +msgstr "Légende" + +#: counter/templates/counter/activity.jinja:20 +msgid "counter is open, there's at least one barman connected" +msgstr "le comptoir est ouvert, il y a au moins un barman de connecté" + +#: counter/templates/counter/activity.jinja:22 +msgid "" +"counter is open but not active, the last sale was done at least %(minutes)s " +"minutes ago " +msgstr "" +"le comptoir est ouvert mais inactif, la dernière vente à eu lieu il y a au " +"moins %(minutes)s minutes" + +#: counter/templates/counter/activity.jinja:24 +msgid "counter is not open : no one is connected" +msgstr "le comptoir est fermé : aucun barman n'est connecté" + #: counter/templates/counter/cash_register_summary.jinja:8 msgid "Make a cash register summary" msgstr "Faire un relevé de caisse" @@ -2484,10 +2600,6 @@ msgstr "Montant du chèque" msgid "Check quantity" msgstr "Nombre de chèque" -#: counter/views.py:1061 -msgid "people(s)" -msgstr "personne(s)" - #: eboutic/models.py:49 msgid "validated" msgstr "validé" @@ -2620,12 +2732,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:427 +#: sith/settings.py:429 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:427 +#: sith/settings.py:429 msgid "Drying" msgstr "Séchage" @@ -2700,107 +2812,107 @@ msgstr "Anglais" msgid "French" msgstr "Français" -#: sith/settings.py:280 sith/settings.py:287 sith/settings.py:308 +#: sith/settings.py:279 sith/settings.py:286 sith/settings.py:307 msgid "Check" msgstr "Chèque" -#: sith/settings.py:281 sith/settings.py:289 sith/settings.py:309 +#: sith/settings.py:280 sith/settings.py:288 sith/settings.py:308 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:282 +#: sith/settings.py:281 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:295 +#: sith/settings.py:294 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:296 +#: sith/settings.py:295 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:297 +#: sith/settings.py:296 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:337 +#: sith/settings.py:336 msgid "One semester" msgstr "Un semestre, 15 €" -#: sith/settings.py:342 +#: sith/settings.py:341 msgid "Two semesters" msgstr "Deux semestres, 28 €" -#: sith/settings.py:347 +#: sith/settings.py:346 msgid "Common core cursus" msgstr "Cursus tronc commun, 45 €" -#: sith/settings.py:352 +#: sith/settings.py:351 msgid "Branch cursus" msgstr "Cursus branche, 45 €" -#: sith/settings.py:357 +#: sith/settings.py:356 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:362 +#: sith/settings.py:361 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:367 +#: sith/settings.py:366 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:372 +#: sith/settings.py:371 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:377 +#: sith/settings.py:376 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:382 +#: sith/settings.py:381 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:387 +#: sith/settings.py:386 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 15 €" -#: sith/settings.py:395 +#: sith/settings.py:394 msgid "President" msgstr "Président" -#: sith/settings.py:396 +#: sith/settings.py:395 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:397 +#: sith/settings.py:396 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:398 +#: sith/settings.py:397 msgid "Communication supervisor" msgstr "Responsable com" -#: sith/settings.py:399 +#: sith/settings.py:398 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:400 +#: sith/settings.py:399 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:401 +#: sith/settings.py:400 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:402 +#: sith/settings.py:401 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:403 +#: sith/settings.py:402 msgid "Curious" msgstr "Curieux" @@ -2844,3 +2956,20 @@ msgstr "Un utilisateur avec cette adresse email existe déjà" msgid "You must either choose an existing user or create a new one properly" msgstr "" "Vous devez soit choisir un utilisateur existant, ou en créer un proprement." + +#: subscription/models.py:68 +msgid "You can not subscribe many time for the same period" +msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période" + +#: subscription/models.py:72 +msgid "Subscription error" +msgstr "Erreur de cotisation" + +#: subscription/views.py:54 +msgid "A user with that email address already exists" +msgstr "Un utilisateur avec cette adresse email existe déjà" + +#: subscription/views.py:70 +msgid "You must either choose an existing user or create a new one properly" +msgstr "" +"Vous devez soit choisir un utilisateur existant, ou en créer un proprement." diff --git a/sith/settings.py b/sith/settings.py index dac219e6..d90f166d 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -191,7 +191,6 @@ STATIC_URL = '/static/' STATIC_ROOT = './static/' # Auth configuration - AUTH_USER_MODEL = 'core.User' AUTH_ANONYMOUS_MODEL = 'core.models.AnonymousUser' LOGIN_URL = '/login' @@ -413,6 +412,9 @@ SITH_BARMAN_TIMEOUT=20 # Minutes to delete the last operations SITH_LAST_OPERATIONS_LIMIT=5 +# Minutes for a counter to be inactive +SITH_COUNTER_MINUTE_INACTIVE=10 + # ET variables SITH_EBOUTIC_ET_URL = "https://preprod-tpeweb.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi" SITH_EBOUTIC_PBX_SITE = "4000666"