diff --git a/counter/views.py b/counter/views.py index 903b4d4d..5ea96ff9 100644 --- a/counter/views.py +++ b/counter/views.py @@ -104,7 +104,7 @@ class CounterMain(DetailView, CheckTokenMixin, ProcessFormView, FormMixin): kwargs['form'] = self.get_form() kwargs['form'].cleaned_data = {} # same as above if "bad_location" in self.request.GET: - kwargs['form'].add_error(None, _("Bad location")) + kwargs['form'].add_error(None, _("Bad location, someone is already logged in somewhere else")) if self.object.type == 'BAR': kwargs['barmen'] = self.object.get_barmen_list() elif self.request.user.is_authenticated(): diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index c6af0593..350d37d0 100644 Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 7737d0cc..5a386d49 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: 2016-09-22 11:08+0200\n" +"POT-Creation-Date: 2016-09-26 11:22+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \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:130 club/models.py:146 counter/models.py:331 +#: accounting/models.py:130 club/models.py:146 counter/models.py:336 #: launderette/models.py:122 msgid "start date" msgstr "date de début" -#: accounting/models.py:131 club/models.py:147 counter/models.py:332 +#: accounting/models.py:131 club/models.py:147 counter/models.py:337 msgid "end date" msgstr "date de fin" @@ -103,7 +103,7 @@ msgid "club account" msgstr "compte club" #: accounting/models.py:135 accounting/models.py:178 counter/models.py:25 -#: counter/models.py:219 +#: counter/models.py:224 msgid "amount" msgstr "montant" @@ -123,17 +123,17 @@ msgstr "numéro" msgid "journal" msgstr "classeur" -#: accounting/models.py:179 core/models.py:461 core/models.py:739 -#: counter/models.py:222 counter/models.py:265 counter/models.py:348 +#: accounting/models.py:179 core/models.py:471 core/models.py:749 +#: counter/models.py:227 counter/models.py:270 counter/models.py:353 #: eboutic/models.py:15 eboutic/models.py:48 msgid "date" msgstr "date" -#: accounting/models.py:180 counter/models.py:349 +#: accounting/models.py:180 counter/models.py:354 msgid "comment" msgstr "commentaire" -#: accounting/models.py:181 counter/models.py:223 counter/models.py:266 +#: accounting/models.py:181 counter/models.py:228 counter/models.py:271 #: subscription/models.py:57 msgid "payment method" msgstr "méthode de paiement" @@ -232,7 +232,7 @@ msgstr "code" msgid "An accounting type code contains only numbers" msgstr "Un code comptable ne contient que des numéros" -#: accounting/models.py:282 accounting/models.py:308 counter/models.py:257 +#: accounting/models.py:282 accounting/models.py:308 counter/models.py:262 msgid "label" msgstr "intitulé" @@ -297,8 +297,10 @@ msgstr "Compte en banque : " #: accounting/templates/accounting/bank_account_details.jinja:15 #: accounting/templates/accounting/club_account_details.jinja:16 +#: club/templates/club/club_sellings.jinja:40 #: core/templates/core/file_detail.jinja:43 #: core/templates/core/group_list.jinja:13 +#: core/templates/core/user_account_detail.jinja:67 #: core/templates/core/user_edit.jinja:18 #: launderette/templates/launderette/launderette_admin.jinja:16 #: launderette/views.py:146 @@ -476,7 +478,7 @@ msgid "Done" msgstr "Effectué" #: accounting/templates/accounting/journal_details.jinja:34 -#: counter/templates/counter/cash_summary_list.jinja:32 counter/views.py:621 +#: counter/templates/counter/cash_summary_list.jinja:32 counter/views.py:646 msgid "Comment" msgstr "Commentaire" @@ -545,7 +547,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:329 counter/models.py:346 +#: club/models.py:144 counter/models.py:334 counter/models.py:351 #: eboutic/models.py:14 eboutic/models.py:47 launderette/models.py:89 #: launderette/models.py:126 msgid "user" @@ -1015,120 +1017,120 @@ msgstr "adresse des parents" msgid "is subscriber viewable" msgstr "profil visible par les cotisants" -#: core/models.py:275 +#: core/models.py:285 msgid "A user with that username already exists" msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" -#: core/models.py:396 core/templates/core/macros.jinja:17 +#: core/models.py:406 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 msgid "Profile" msgstr "Profil" -#: core/models.py:438 +#: core/models.py:448 msgid "Visitor" msgstr "Visiteur" -#: core/models.py:443 +#: core/models.py:453 msgid "define if we show a users stats" msgstr "Definit si l'on montre les statistiques de l'utilisateur" -#: core/models.py:445 +#: core/models.py:455 msgid "Show your account statistics to others" msgstr "Montrez vos statistiques de compte aux autres" -#: core/models.py:452 +#: core/models.py:462 msgid "file name" msgstr "nom du fichier" -#: core/models.py:453 core/models.py:588 +#: core/models.py:463 core/models.py:598 msgid "parent" msgstr "parent" -#: core/models.py:454 core/models.py:464 +#: core/models.py:464 core/models.py:474 msgid "file" msgstr "fichier" -#: core/models.py:455 +#: core/models.py:465 msgid "owner" msgstr "propriétaire" -#: core/models.py:456 core/models.py:594 +#: core/models.py:466 core/models.py:604 msgid "edit group" msgstr "groupe d'édition" -#: core/models.py:457 core/models.py:595 +#: core/models.py:467 core/models.py:605 msgid "view group" msgstr "groupe de vue" -#: core/models.py:458 +#: core/models.py:468 msgid "is folder" msgstr "est un dossier" -#: core/models.py:459 +#: core/models.py:469 msgid "mime type" msgstr "type mime" -#: core/models.py:460 +#: core/models.py:470 msgid "size" msgstr "taille" -#: core/models.py:492 +#: core/models.py:502 msgid "Character '/' not authorized in name" msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier" -#: core/models.py:495 core/models.py:500 +#: core/models.py:505 core/models.py:510 msgid "Loop in folder tree" msgstr "Boucle dans l'arborescence des dossiers" -#: core/models.py:504 +#: core/models.py:514 msgid "You can not make a file be a children of a non folder file" msgstr "" "Vous ne pouvez pas mettre un fichier enfant de quelque chose qui n'est pas " "un dossier" -#: core/models.py:508 +#: core/models.py:518 msgid "Duplicate file" msgstr "Un fichier de ce nom existe déjà" -#: core/models.py:518 +#: core/models.py:528 msgid "You must provide a file" msgstr "Vous devez fournir un fichier" -#: core/models.py:543 +#: core/models.py:553 msgid "Folder: " msgstr "Dossier : " -#: core/models.py:545 +#: core/models.py:555 msgid "File: " msgstr "Fichier : " -#: core/models.py:587 core/models.py:591 +#: core/models.py:597 core/models.py:601 msgid "page name" msgstr "nom de la page" -#: core/models.py:592 +#: core/models.py:602 msgid "owner group" msgstr "groupe propriétaire" -#: core/models.py:623 +#: core/models.py:633 msgid "Duplicate page" msgstr "Une page de ce nom existe déjà" -#: core/models.py:629 +#: core/models.py:639 msgid "Loop in page tree" msgstr "Boucle dans l'arborescence des pages" -#: core/models.py:736 +#: core/models.py:746 msgid "revision" msgstr "révision" -#: core/models.py:737 +#: core/models.py:747 msgid "page title" msgstr "titre de la page" -#: core/models.py:738 +#: core/models.py:748 msgid "page content" msgstr "contenu de la page" @@ -1190,7 +1192,7 @@ msgid "Services" msgstr "Services" #: core/templates/core/base.jinja:72 core/templates/core/file.jinja:20 -#: core/views/files.py:42 +#: core/views/files.py:47 msgid "Files" msgstr "Fichiers" @@ -1340,7 +1342,7 @@ msgid "Please login to see this page." msgstr "Merci de vous identifier pour voir cette page." #: core/templates/core/login.jinja:28 -#: counter/templates/counter/counter_main.jinja:53 +#: counter/templates/counter/counter_main.jinja:54 msgid "login" msgstr "login" @@ -1628,7 +1630,7 @@ msgstr "Profil de %(user_name)s" msgid "Option: " msgstr "Filière : " -#: core/templates/core/user_detail.jinja:58 +#: core/templates/core/user_detail.jinja:59 #, python-format msgid "Subscribed until %(subscription_end)s" msgstr "Cotisant jusqu'au %(subscription_end)s" @@ -1638,11 +1640,11 @@ msgstr "Cotisant jusqu'au %(subscription_end)s" msgid "Account number: " msgstr "Numero de compte : " -#: core/templates/core/user_detail.jinja:67 +#: core/templates/core/user_detail.jinja:69 msgid "Not subscribed" msgstr "Non cotisant" -#: core/templates/core/user_detail.jinja:69 +#: core/templates/core/user_detail.jinja:71 #: subscription/templates/subscription/subscription.jinja:4 #: subscription/templates/subscription/subscription.jinja:8 msgid "New subscription" @@ -1757,8 +1759,8 @@ msgstr "Fusionner deux utilisateurs" msgid "Subscriptions" msgstr "Cotisations" -#: core/templates/core/user_tools.jinja:23 counter/views.py:395 -#: counter/views.py:534 +#: core/templates/core/user_tools.jinja:23 counter/views.py:420 +#: counter/views.py:559 msgid "Counters" msgstr "Comptoirs" @@ -1779,7 +1781,7 @@ msgid "Product types management" msgstr "Gestion des types de produit" #: core/templates/core/user_tools.jinja:30 -#: counter/templates/counter/cash_summary_list.jinja:18 counter/views.py:415 +#: counter/templates/counter/cash_summary_list.jinja:18 counter/views.py:440 msgid "Cash register summaries" msgstr "Relevés de caisse" @@ -1798,16 +1800,16 @@ msgstr "Comptabilité générale" msgid "Club account: " msgstr "Compte club : " -#: core/views/files.py:41 +#: core/views/files.py:46 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: core/views/files.py:52 +#: core/views/files.py:57 #, python-format msgid "Error creating folder %(folder_name)s: %(msg)s" msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s" -#: core/views/files.py:61 core/views/forms.py:181 core/views/forms.py:185 +#: core/views/files.py:66 core/views/forms.py:181 core/views/forms.py:185 #, python-format msgid "Error uploading file %(file_name)s: %(msg)s" msgstr "Erreur d'envoie du fichier %(file_name)s : %(msg)s" @@ -1953,73 +1955,73 @@ msgstr "vendeurs" msgid "token" msgstr "jeton" -#: counter/models.py:132 counter/models.py:330 counter/models.py:347 +#: counter/models.py:132 counter/models.py:335 counter/models.py:352 #: launderette/models.py:16 msgid "counter" msgstr "comptoir" -#: counter/models.py:225 +#: counter/models.py:230 msgid "bank" msgstr "banque" -#: counter/models.py:227 counter/models.py:268 +#: counter/models.py:232 counter/models.py:273 msgid "is validated" msgstr "est validé" -#: counter/models.py:230 +#: counter/models.py:235 msgid "refilling" msgstr "rechargement" -#: counter/models.py:261 eboutic/models.py:103 +#: counter/models.py:266 eboutic/models.py:103 msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:262 counter/models.py:380 eboutic/models.py:104 +#: counter/models.py:267 counter/models.py:385 eboutic/models.py:104 msgid "quantity" msgstr "quantité" -#: counter/models.py:267 +#: counter/models.py:272 msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:267 sith/settings.py:271 sith/settings.py:276 +#: counter/models.py:272 sith/settings.py:271 sith/settings.py:276 #: sith/settings.py:298 msgid "Credit card" msgstr "Carte bancaire" -#: counter/models.py:271 +#: counter/models.py:276 msgid "selling" msgstr "vente" -#: counter/models.py:333 +#: counter/models.py:338 msgid "last activity date" msgstr "dernière activité" -#: counter/models.py:336 +#: counter/models.py:341 msgid "permanency" msgstr "permanence" -#: counter/models.py:350 +#: counter/models.py:355 msgid "emptied" msgstr "coffre vidée" -#: counter/models.py:353 +#: counter/models.py:358 msgid "cash register summary" msgstr "relevé de caisse" -#: counter/models.py:378 +#: counter/models.py:383 msgid "cash summary" msgstr "relevé" -#: counter/models.py:379 +#: counter/models.py:384 msgid "value" msgstr "valeur" -#: counter/models.py:381 +#: counter/models.py:386 msgid "check" msgstr "chèque" -#: counter/models.py:384 +#: counter/models.py:389 msgid "cash register summary item" msgstr "élément de relevé de caisse" @@ -2034,7 +2036,7 @@ msgid "Barman list" msgstr "Barmans" #: counter/templates/counter/cash_register_summary.jinja:8 -#: counter/templates/counter/counter_main.jinja:43 +#: counter/templates/counter/counter_main.jinja:44 msgid "Make a cash register summary" msgstr "Faire un relevé de caisse" @@ -2047,7 +2049,7 @@ msgstr "Liste des relevés de caisse" msgid "Theoric sums" msgstr "Sommes théoriques" -#: counter/templates/counter/cash_summary_list.jinja:31 counter/views.py:622 +#: counter/templates/counter/cash_summary_list.jinja:31 counter/views.py:647 msgid "Emptied" msgstr "Coffre vidé" @@ -2141,15 +2143,15 @@ msgstr "Nouveau montant : " msgid "Enter client code:" msgstr "Entrez un code client : " -#: counter/templates/counter/counter_main.jinja:35 +#: counter/templates/counter/counter_main.jinja:36 msgid "validate" msgstr "valider" -#: counter/templates/counter/counter_main.jinja:38 +#: counter/templates/counter/counter_main.jinja:39 msgid "Please, login" msgstr "Merci de vous identifier" -#: counter/templates/counter/counter_main.jinja:46 +#: counter/templates/counter/counter_main.jinja:47 msgid "Barman: " msgstr "Barman : " @@ -2202,97 +2204,101 @@ msgstr "Pourcentage" msgid "User not found" msgstr "Utilisateur non trouvé" -#: counter/views.py:86 +#: counter/views.py:101 msgid "Bad credentials" msgstr "Mauvais identifiants" -#: counter/views.py:88 +#: counter/views.py:103 msgid "User is not barman" msgstr "L'utilisateur n'est pas barman." -#: counter/views.py:268 +#: counter/views.py:107 +msgid "Bad location, someone is already logged in somewhere else" +msgstr "Mauvais comptoir, quelqu'un est déjà connecté ailleurs" + +#: counter/views.py:290 msgid "END" msgstr "FIN" -#: counter/views.py:270 +#: counter/views.py:292 msgid "CAN" msgstr "ANN" -#: counter/views.py:300 +#: counter/views.py:322 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: counter/views.py:390 +#: counter/views.py:415 msgid "Counter administration" msgstr "Administration des comptoirs" -#: counter/views.py:400 +#: counter/views.py:425 msgid "Products" msgstr "Produits" -#: counter/views.py:405 +#: counter/views.py:430 msgid "Archived products" msgstr "Produits archivés" -#: counter/views.py:410 +#: counter/views.py:435 msgid "Product types" msgstr "Types de produit" -#: counter/views.py:531 +#: counter/views.py:556 msgid "Parent product" msgstr "Produit parent" -#: counter/views.py:532 +#: counter/views.py:557 msgid "Buying groups" msgstr "Groupes d'achat" -#: counter/views.py:601 +#: counter/views.py:626 msgid "10 cents" msgstr "10 centimes" -#: counter/views.py:602 +#: counter/views.py:627 msgid "20 cents" msgstr "20 centimes" -#: counter/views.py:603 +#: counter/views.py:628 msgid "50 cents" msgstr "50 centimes" -#: counter/views.py:604 +#: counter/views.py:629 msgid "1 euro" msgstr "1 €" -#: counter/views.py:605 +#: counter/views.py:630 msgid "2 euros" msgstr "2 €" -#: counter/views.py:606 +#: counter/views.py:631 msgid "5 euros" msgstr "5 €" -#: counter/views.py:607 +#: counter/views.py:632 msgid "10 euros" msgstr "10 €" -#: counter/views.py:608 +#: counter/views.py:633 msgid "20 euros" msgstr "20 €" -#: counter/views.py:609 +#: counter/views.py:634 msgid "50 euros" msgstr "50 €" -#: counter/views.py:610 +#: counter/views.py:635 msgid "100 euros" msgstr "100 €" -#: counter/views.py:611 counter/views.py:613 counter/views.py:615 -#: counter/views.py:617 counter/views.py:619 +#: counter/views.py:636 counter/views.py:638 counter/views.py:640 +#: counter/views.py:642 counter/views.py:644 msgid "Check amount" msgstr "Montant du chèque" -#: counter/views.py:612 counter/views.py:614 counter/views.py:616 -#: counter/views.py:618 counter/views.py:620 +#: counter/views.py:637 counter/views.py:639 counter/views.py:641 +#: counter/views.py:643 counter/views.py:645 msgid "Check quantity" msgstr "Nombre de chèque" @@ -2652,3 +2658,4 @@ 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." +