diff --git a/com/static/com/css/news-list.scss b/com/static/com/css/news-list.scss index a33e6315..4e6ca7a6 100644 --- a/com/static/com/css/news-list.scss +++ b/com/static/com/css/news-list.scss @@ -8,37 +8,33 @@ flex-direction: column; } - .news_column { - display: inline-block; - margin: 0; - vertical-align: top; - } - #news_admin { margin-bottom: 1em; } #right_column { flex: 20%; - float: right; - margin: 0.2em; + margin: 3.2px; + + display: inline-block; + vertical-align: top; } #left_column { flex: 79%; margin: 0.2em; + } - h3 { - background: $second-color; - box-shadow: $shadow-color 1px 1px 1px; - padding: 0.4em; - margin: 0 0 0.5em 0; - text-transform: uppercase; - font-size: 1.1em; + h3 { + background: $second-color; + box-shadow: $shadow-color 1px 1px 1px; + padding: 0.4em; + margin: 0 0 0.5em 0; + text-transform: uppercase; + font-size: 1.1em; - &:not(:first-of-type) { - margin: 2em 0 1em 0; - } + &:not(:first-of-type) { + margin: 2em 0 1em 0; } } @@ -50,8 +46,8 @@ } } - /* AGENDA/BIRTHDAYS */ - #agenda, + /* LINKS/BIRTHDAYS */ + #links, #birthdays { display: block; width: 100%; @@ -59,9 +55,7 @@ font-size: 70%; margin-bottom: 1em; - #agenda_title, - #birthdays_title { - margin: 0; + h3 { border-radius: 5px 5px 0 0; box-shadow: $shadow-color 1px 1px 1px; padding: 0.5em; @@ -72,34 +66,27 @@ background: $second-color; } - #agenda_content { + #links_content { overflow: auto; box-shadow: $shadow-color 1px 1px 1px; height: 20em; - } - #agenda_content, - #birthdays_content { - .agenda_item { - padding: 0.5em; - margin-bottom: 0.5em; - - &:nth-of-type(even) { - background: $secondary-neutral-light-color; - } - - .agenda_time { - font-size: 90%; - color: grey; - } - - .agenda_item_content { - p { - margin-top: 0.2em; - } - } + h4 { + margin-left: 5px; } + li { + margin: 10px; + } + + i { + width: 20px; + margin: 5px; + } + } + + + #birthdays_content { ul.birthdays_year { margin: 0; list-style-type: none; @@ -124,9 +111,9 @@ } } - /* END AGENDA/BIRTHDAYS */ + /* END AGENDA/BIRTHDAYS */ - /* EVENTS TODAY AND NEXT FEW DAYS */ + /* EVENTS TODAY AND NEXT FEW DAYS */ .news_events_group { box-shadow: $shadow-color 1px 1px 1px; margin-left: 1em; @@ -222,9 +209,9 @@ } } - /* END EVENTS TODAY AND NEXT FEW DAYS */ + /* END EVENTS TODAY AND NEXT FEW DAYS */ - /* COMING SOON */ + /* COMING SOON */ .news_coming_soon { display: list-item; list-style-type: square; @@ -242,9 +229,9 @@ } } - /* END COMING SOON */ + /* END COMING SOON */ - /* NOTICES */ + /* NOTICES */ .news_notice { margin: 0 0 1em 1em; padding: 0.4em; @@ -262,9 +249,9 @@ } } - /* END NOTICES */ + /* END NOTICES */ - /* CALLS */ + /* CALLS */ .news_call { margin: 0 0 1em 1em; padding: 0.4em; @@ -286,7 +273,7 @@ } } - /* END CALLS */ + /* END CALLS */ .news_empty { margin-left: 1em; diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja index 385cbe32..28f998ca 100644 --- a/com/templates/com/news_list.jinja +++ b/com/templates/com/news_list.jinja @@ -99,35 +99,48 @@ -
-
-
{% trans %}Agenda{% endtrans %}
-
- {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(), - news__is_moderated=True, news__type__in=["WEEKLY", - "EVENT"]).order_by('start_date', 'end_date') %} -
-
- {{ d.start_date|localtime|date('D d M Y') }} -
-
- {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - - {{ d.end_date|localtime|time(DATETIME_FORMAT) }} -
-
- {{ d.news.title }} - {{ d.news.club }} -
-
{{ d.news.summary|markdown }}
-
- {% endfor %} +
+
-
{% trans %}Birthdays{% endtrans %}
+

{% trans %}Birthdays{% endtrans %}

- {%- if user.is_subscribed -%} + {%- if user.was_subscribed -%}
    {%- for year, users in birthdays -%}
  • @@ -141,7 +154,7 @@ {%- endfor -%}
{%- else -%} -

{% trans %}You need an up to date subscription to access this content{% endtrans %}

+

{% trans %}You need to subscribe to access this content{% endtrans %}

{%- endif -%}
diff --git a/com/tests.py b/com/tests.py index 399eb0e8..3f98bfdc 100644 --- a/com/tests.py +++ b/com/tests.py @@ -97,9 +97,7 @@ class TestCom(TestCase): response = self.client.get(reverse("core:index")) self.assertContains( response, - text=html.escape( - _("You need an up to date subscription to access this content") - ), + text=html.escape(_("You need to subscribe to access this content")), ) def test_birthday_subscibed_user(self): @@ -107,9 +105,16 @@ class TestCom(TestCase): self.assertNotContains( response, - text=html.escape( - _("You need an up to date subscription to access this content") - ), + text=html.escape(_("You need to subscribe to access this content")), + ) + + def test_birthday_old_subscibed_user(self): + self.client.force_login(User.objects.get(username="old_subscriber")) + response = self.client.get(reverse("core:index")) + + self.assertNotContains( + response, + text=html.escape(_("You need to subscribe to access this content")), ) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d6c2e813..b54e8f1f 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: 2024-12-23 02:37+0100\n" +"POT-Creation-Date: 2025-01-02 02:27+0100\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Maréchal \n" @@ -218,7 +218,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:307 core/models.py:303 sith/settings.py:424 +#: accounting/models.py:307 core/models.py:303 sith/settings.py:425 msgid "Other" msgstr "Autre" @@ -413,12 +413,11 @@ msgstr "Nouveau compte club" #: com/templates/com/news_admin_list.jinja:232 #: com/templates/com/news_admin_list.jinja:273 #: com/templates/com/news_admin_list.jinja:308 -#: com/templates/com/poster_list.jinja:43 -#: com/templates/com/poster_list.jinja:45 +#: com/templates/com/poster_list.jinja:47 +#: com/templates/com/poster_list.jinja:49 #: com/templates/com/screen_list.jinja:26 com/templates/com/weekmail.jinja:32 #: com/templates/com/weekmail.jinja:61 core/templates/core/file.jinja:42 #: core/templates/core/group_list.jinja:24 core/templates/core/page.jinja:35 -#: core/templates/core/poster_list.jinja:40 #: core/templates/core/user_tools.jinja:71 core/views/user.py:231 #: counter/templates/counter/cash_summary_list.jinja:53 #: counter/templates/counter/counter_list.jinja:17 @@ -517,7 +516,7 @@ msgid "Effective amount" msgstr "Montant effectif" #: accounting/templates/accounting/club_account_details.jinja:36 -#: sith/settings.py:462 +#: sith/settings.py:463 msgid "Closed" msgstr "Fermé" @@ -586,7 +585,7 @@ msgstr "Classeur : " #: accounting/templates/accounting/journal_statement_accounting.jinja:30 #: core/templates/core/user_account.jinja:39 #: core/templates/core/user_account_detail.jinja:9 -#: counter/templates/counter/counter_click.jinja:46 +#: counter/templates/counter/counter_click.jinja:39 msgid "Amount: " msgstr "Montant : " @@ -950,11 +949,11 @@ msgstr "Une action est requise" msgid "You must specify at least an user or an email address" msgstr "vous devez spécifier au moins un utilisateur ou une adresse email" -#: club/forms.py:149 counter/forms.py:207 +#: club/forms.py:149 counter/forms.py:209 msgid "Begin date" msgstr "Date de début" -#: club/forms.py:152 com/views.py:84 com/views.py:202 counter/forms.py:210 +#: club/forms.py:152 com/views.py:84 com/views.py:202 counter/forms.py:212 #: election/views.py:170 subscription/forms.py:21 msgid "End date" msgstr "Date de fin" @@ -1146,7 +1145,7 @@ msgid "There are no members in this club." msgstr "Il n'y a pas de membres dans ce club." #: club/templates/club/club_members.jinja:80 -#: core/templates/core/file_detail.jinja:19 core/views/forms.py:309 +#: core/templates/core/file_detail.jinja:19 core/views/forms.py:313 #: launderette/views.py:208 trombi/templates/trombi/detail.jinja:19 msgid "Add" msgstr "Ajouter" @@ -1217,7 +1216,7 @@ msgid "Barman" msgstr "Barman" #: club/templates/club/club_sellings.jinja:51 -#: counter/templates/counter/counter_click.jinja:43 +#: counter/templates/counter/counter_click.jinja:36 #: counter/templates/counter/last_ops.jinja:22 #: counter/templates/counter/last_ops.jinja:47 #: counter/templates/counter/refilling_list.jinja:12 @@ -1278,8 +1277,7 @@ msgid "New Trombi" msgstr "Nouveau Trombi" #: club/templates/club/club_tools.jinja:14 -#: com/templates/com/poster_list.jinja:17 -#: core/templates/core/poster_list.jinja:17 +#: com/templates/com/poster_list.jinja:21 #: core/templates/core/user_tools.jinja:137 msgid "Posters" msgstr "Affiches" @@ -1530,7 +1528,7 @@ msgstr "Administration des mailing listes" #: com/templates/com/news_admin_list.jinja:157 #: com/templates/com/news_admin_list.jinja:233 #: com/templates/com/news_admin_list.jinja:309 -#: com/templates/com/news_detail.jinja:39 +#: com/templates/com/news_detail.jinja:44 #: core/templates/core/file_detail.jinja:65 #: core/templates/core/file_moderation.jinja:42 #: sas/templates/sas/moderation.jinja:17 sas/templates/sas/picture.jinja:68 @@ -1687,19 +1685,19 @@ msgstr "Événements affichés" msgid "Events to moderate" msgstr "Événements à modérer" -#: com/templates/com/news_detail.jinja:15 +#: com/templates/com/news_detail.jinja:20 msgid "Back to news" msgstr "Retour aux nouvelles" -#: com/templates/com/news_detail.jinja:35 com/templates/com/news_edit.jinja:25 +#: com/templates/com/news_detail.jinja:40 com/templates/com/news_edit.jinja:25 msgid "Author: " msgstr "Auteur : " -#: com/templates/com/news_detail.jinja:37 +#: com/templates/com/news_detail.jinja:42 msgid "Moderator: " msgstr "Modérateur : " -#: com/templates/com/news_detail.jinja:42 +#: com/templates/com/news_detail.jinja:47 msgid "Edit (will be moderated again)" msgstr "Éditer (sera soumise de nouveau à la modération)" @@ -1734,51 +1732,82 @@ msgstr "" msgid "Preview" msgstr "Prévisualiser" -#: com/templates/com/news_list.jinja:11 +#: com/templates/com/news_list.jinja:20 msgid "Administrate news" msgstr "Administrer les news" -#: com/templates/com/news_list.jinja:39 +#: com/templates/com/news_list.jinja:48 msgid "Events today and the next few days" msgstr "Événements aujourd'hui et dans les prochains jours" -#: com/templates/com/news_list.jinja:82 +#: com/templates/com/news_list.jinja:91 msgid "Nothing to come..." msgstr "Rien à venir..." -#: com/templates/com/news_list.jinja:89 -msgid "Coming soon... don't miss!" -msgstr "Prochainement... à ne pas rater!" - -#: com/templates/com/news_list.jinja:101 +#: com/templates/com/news_list.jinja:96 msgid "All coming events" msgstr "Tous les événements à venir" -#: com/templates/com/news_list.jinja:113 -msgid "Agenda" -msgstr "Agenda" +#: com/templates/com/news_list.jinja:104 +msgid "Links" +msgstr "Liens" -#: com/templates/com/news_list.jinja:137 +#: com/templates/com/news_list.jinja:106 +msgid "Our services" +msgstr "Nos services" + +#: com/templates/com/news_list.jinja:110 +#: pedagogy/templates/pedagogy/guide.jinja:5 +msgid "UV Guide" +msgstr "Guide des UVs" + +#: com/templates/com/news_list.jinja:114 +#: core/templates/core/base/navbar.jinja:26 +msgid "Matmatronch" +msgstr "Matmatronch" + +#: com/templates/com/news_list.jinja:118 +#: core/templates/core/base/navbar.jinja:16 +#: core/templates/core/user_tools.jinja:172 +msgid "Elections" +msgstr "Élections" + +#: com/templates/com/news_list.jinja:122 +msgid "Social media" +msgstr "Réseaux sociaux" + +#: com/templates/com/news_list.jinja:126 +msgid "Discord" +msgstr "Discord" + +#: com/templates/com/news_list.jinja:130 +msgid "Facebook" +msgstr "Facebook" + +#: com/templates/com/news_list.jinja:134 +msgid "Instagram" +msgstr "Instagram" + +#: com/templates/com/news_list.jinja:141 msgid "Birthdays" msgstr "Anniversaires" -#: com/templates/com/news_list.jinja:143 +#: com/templates/com/news_list.jinja:147 #, python-format msgid "%(age)s year old" msgstr "%(age)s ans" -#: com/templates/com/news_list.jinja:153 com/tests.py:101 com/tests.py:111 -msgid "You need an up to date subscription to access this content" -msgstr "Votre cotisation doit être à jour pour accéder à cette section" +#: com/templates/com/news_list.jinja:157 +msgid "You need to subscribe to access this content" +msgstr "Vous devez cotiser pour accéder à ce contenu" #: com/templates/com/poster_edit.jinja:4 com/templates/com/poster_list.jinja:10 -#: core/templates/core/poster_list.jinja:10 msgid "Poster" msgstr "Affiche" #: com/templates/com/poster_edit.jinja:13 #: com/templates/com/poster_edit.jinja:15 -#: com/templates/com/poster_moderate.jinja:13 +#: com/templates/com/poster_moderate.jinja:17 #: com/templates/com/screen_edit.jinja:12 msgid "List" msgstr "Liste" @@ -1787,28 +1816,25 @@ msgstr "Liste" msgid "Posters - edit" msgstr "Affiche - modifier" -#: com/templates/com/poster_list.jinja:20 -#: com/templates/com/poster_list.jinja:23 -#: com/templates/com/screen_list.jinja:13 -#: core/templates/core/poster_list.jinja:19 sas/templates/sas/main.jinja:75 +#: com/templates/com/poster_list.jinja:24 +#: com/templates/com/poster_list.jinja:27 +#: com/templates/com/screen_list.jinja:13 sas/templates/sas/main.jinja:75 msgid "Create" msgstr "Créer" -#: com/templates/com/poster_list.jinja:21 -#: core/templates/core/poster_list.jinja:21 +#: com/templates/com/poster_list.jinja:25 msgid "Moderation" msgstr "Modération" -#: com/templates/com/poster_list.jinja:31 -#: core/templates/core/poster_list.jinja:29 +#: com/templates/com/poster_list.jinja:35 msgid "No posters" msgstr "Aucune affiche" -#: com/templates/com/poster_moderate.jinja:15 +#: com/templates/com/poster_moderate.jinja:19 msgid "Posters - moderation" msgstr "Affiches - modération" -#: com/templates/com/poster_moderate.jinja:21 +#: com/templates/com/poster_moderate.jinja:25 msgid "No objects" msgstr "Aucun éléments" @@ -1932,6 +1958,10 @@ msgstr "Astuce" msgid "Final word" msgstr "Le mot de la fin" +#: com/tests.py:101 com/tests.py:111 +msgid "You need an up to date subscription to access this content" +msgstr "Votre cotisation doit être à jour pour accéder à cette section" + #: com/views.py:75 msgid "Format: 16:9 | Resolution: 1920x1080" msgstr "Format : 16:9 | Résolution : 1920x1080" @@ -2454,11 +2484,6 @@ msgstr "Les clubs de L'AE" msgid "Others UTBM's Associations" msgstr "Les autres associations de l'UTBM" -#: core/templates/core/base/navbar.jinja:16 -#: core/templates/core/user_tools.jinja:172 -msgid "Elections" -msgstr "Élections" - #: core/templates/core/base/navbar.jinja:17 msgid "Big event" msgstr "Grandes Activités" @@ -2482,7 +2507,7 @@ msgstr "Photos" #: eboutic/templates/eboutic/eboutic_main.jinja:23 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:16 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 -#: sith/settings.py:423 sith/settings.py:431 +#: sith/settings.py:424 sith/settings.py:432 msgid "Eboutic" msgstr "Eboutic" @@ -2490,10 +2515,6 @@ msgstr "Eboutic" msgid "Services" msgstr "Services" -#: core/templates/core/base/navbar.jinja:26 -msgid "Matmatronch" -msgstr "Matmatronch" - #: core/templates/core/base/navbar.jinja:27 launderette/models.py:38 #: launderette/templates/launderette/launderette_book.jinja:5 #: launderette/templates/launderette/launderette_book_choose.jinja:4 @@ -2562,7 +2583,7 @@ msgstr "Confirmation" #: core/templates/core/delete_confirm.jinja:20 #: core/templates/core/file_delete_confirm.jinja:46 -#: counter/templates/counter/counter_click.jinja:125 +#: counter/templates/counter/counter_click.jinja:155 #: counter/templates/counter/fragments/delete_student_card.jinja:12 #: sas/templates/sas/ask_picture_removal.jinja:20 msgid "Cancel" @@ -2676,7 +2697,7 @@ msgid "Edit group" msgstr "Éditer le groupe" #: core/templates/core/group_edit.jinja:9 -#: core/templates/core/user_edit.jinja:170 +#: core/templates/core/user_edit.jinja:167 #: core/templates/core/user_group.jinja:13 #: pedagogy/templates/pedagogy/uv_edit.jinja:36 msgid "Update" @@ -3162,27 +3183,27 @@ msgstr "Activer la caméra" msgid "Take a picture" msgstr "Prendre une photo" -#: core/templates/core/user_edit.jinja:69 +#: core/templates/core/user_edit.jinja:67 msgid "To edit your profile picture, ask a member of the AE" msgstr "Pour changer votre photo de profil, demandez à un membre de l'AE" -#: core/templates/core/user_edit.jinja:98 +#: core/templates/core/user_edit.jinja:96 msgid "Edit user profile" msgstr "Éditer le profil de l'utilisateur" -#: core/templates/core/user_edit.jinja:160 +#: core/templates/core/user_edit.jinja:157 msgid "Change my password" msgstr "Changer mon mot de passe" -#: core/templates/core/user_edit.jinja:165 +#: core/templates/core/user_edit.jinja:162 msgid "Change user password" msgstr "Changer le mot de passe" -#: core/templates/core/user_edit.jinja:175 +#: core/templates/core/user_edit.jinja:173 msgid "Username:" msgstr "Nom d'utilisateur : " -#: core/templates/core/user_edit.jinja:178 +#: core/templates/core/user_edit.jinja:176 msgid "Account number:" msgstr "Numéro de compte : " @@ -3276,7 +3297,7 @@ msgid "Go to my Trombi tools" msgstr "Allez à mes outils de Trombi" #: core/templates/core/user_preferences.jinja:39 -#: counter/templates/counter/counter_click.jinja:149 +#: counter/templates/counter/counter_click.jinja:180 msgid "Student card" msgstr "Carte étudiante" @@ -3326,7 +3347,7 @@ msgstr "Outils utilisateurs" msgid "Sith management" msgstr "Gestion de Sith" -#: core/templates/core/user_tools.jinja:21 core/views/forms.py:295 +#: core/templates/core/user_tools.jinja:21 core/views/forms.py:298 #: core/views/user.py:254 msgid "Groups" msgstr "Groupes" @@ -3355,7 +3376,7 @@ msgstr "Cotisations" msgid "Subscription stats" msgstr "Statistiques de cotisation" -#: core/templates/core/user_tools.jinja:48 counter/forms.py:180 +#: core/templates/core/user_tools.jinja:48 counter/forms.py:182 #: counter/views/mixins.py:89 msgid "Counters" msgstr "Comptoirs" @@ -3477,7 +3498,7 @@ msgstr "Ajouter un nouveau dossier" 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:159 core/views/forms.py:270 core/views/forms.py:277 +#: core/views/files.py:159 core/views/forms.py:273 core/views/forms.py:280 #: sas/forms.py:60 #, python-format msgid "Error uploading file %(file_name)s: %(msg)s" @@ -3499,7 +3520,7 @@ msgstr "Choisir un utilisateur" msgid "Username, email, or account number" msgstr "Nom d'utilisateur, email, ou numéro de compte AE" -#: core/views/forms.py:220 +#: core/views/forms.py:223 msgid "" "Profile: you need to be visible on the picture, in order to be recognized (e." "g. by the barmen)" @@ -3507,44 +3528,44 @@ msgstr "" "Photo de profil: vous devez être visible sur la photo afin d'être reconnu " "(par exemple par les barmen)" -#: core/views/forms.py:225 +#: core/views/forms.py:228 msgid "Avatar: used on the forum" msgstr "Avatar : utilisé sur le forum" -#: core/views/forms.py:229 +#: core/views/forms.py:232 msgid "Scrub: let other know how your scrub looks like!" msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !" -#: core/views/forms.py:281 +#: core/views/forms.py:284 msgid "Bad image format, only jpeg, png, webp and gif are accepted" msgstr "Mauvais format d'image, seuls les jpeg, png, webp et gif sont acceptés" -#: core/views/forms.py:306 +#: core/views/forms.py:310 msgid "Godfather / Godmother" msgstr "Parrain / Marraine" -#: core/views/forms.py:307 +#: core/views/forms.py:311 msgid "Godchild" msgstr "Fillot / Fillote" -#: core/views/forms.py:312 counter/forms.py:78 trombi/views.py:151 +#: core/views/forms.py:316 counter/forms.py:80 trombi/views.py:151 msgid "Select user" msgstr "Choisir un utilisateur" -#: core/views/forms.py:326 +#: core/views/forms.py:330 msgid "This user does not exist" msgstr "Cet utilisateur n'existe pas" -#: core/views/forms.py:328 +#: core/views/forms.py:332 msgid "You cannot be related to yourself" msgstr "Vous ne pouvez pas être relié à vous-même" -#: core/views/forms.py:340 +#: core/views/forms.py:344 #, python-format msgid "%s is already your godfather" msgstr "%s est déjà votre parrain/marraine" -#: core/views/forms.py:346 +#: core/views/forms.py:350 #, python-format msgid "%s is already your godchild" msgstr "%s est déjà votre fillot/fillote" @@ -3575,16 +3596,16 @@ msgstr "Photos" msgid "Galaxy" msgstr "Galaxie" -#: counter/apps.py:28 sith/settings.py:413 sith/settings.py:420 +#: counter/apps.py:28 sith/settings.py:414 sith/settings.py:421 msgid "Check" msgstr "Chèque" -#: counter/apps.py:29 sith/settings.py:414 sith/settings.py:422 +#: counter/apps.py:29 sith/settings.py:415 sith/settings.py:423 msgid "Cash" msgstr "Espèces" -#: counter/apps.py:30 counter/models.py:833 sith/settings.py:416 -#: sith/settings.py:421 +#: counter/apps.py:30 counter/models.py:833 sith/settings.py:417 +#: sith/settings.py:422 msgid "Credit card" msgstr "Carte bancaire" @@ -3593,11 +3614,11 @@ msgstr "Carte bancaire" msgid "counter" msgstr "comptoir" -#: counter/forms.py:59 +#: counter/forms.py:61 msgid "This UID is invalid" msgstr "Cet UID est invalide" -#: counter/forms.py:108 +#: counter/forms.py:110 msgid "User not found" msgstr "Utilisateur non trouvé" @@ -3918,28 +3939,28 @@ msgstr "oui" msgid "There is no cash register summary in this website." msgstr "Il n'y a pas de relevé de caisse dans ce site web." -#: counter/templates/counter/counter_click.jinja:55 +#: counter/templates/counter/counter_click.jinja:48 #: launderette/templates/launderette/launderette_admin.jinja:8 msgid "Selling" msgstr "Vente" -#: counter/templates/counter/counter_click.jinja:66 +#: counter/templates/counter/counter_click.jinja:55 msgid "Select a product..." msgstr "Sélectionnez un produit…" -#: counter/templates/counter/counter_click.jinja:68 +#: counter/templates/counter/counter_click.jinja:57 msgid "Operations" msgstr "Opérations" -#: counter/templates/counter/counter_click.jinja:69 +#: counter/templates/counter/counter_click.jinja:58 msgid "Confirm (FIN)" msgstr "Confirmer (FIN)" -#: counter/templates/counter/counter_click.jinja:70 +#: counter/templates/counter/counter_click.jinja:59 msgid "Cancel (ANN)" msgstr "Annuler (ANN)" -#: counter/templates/counter/counter_click.jinja:81 +#: counter/templates/counter/counter_click.jinja:70 #: counter/templates/counter/fragments/create_refill.jinja:8 #: counter/templates/counter/fragments/create_student_card.jinja:10 #: counter/templates/counter/invoices_call.jinja:16 @@ -3950,25 +3971,25 @@ msgstr "Annuler (ANN)" msgid "Go" msgstr "Valider" -#: counter/templates/counter/counter_click.jinja:89 +#: counter/templates/counter/counter_click.jinja:78 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:19 msgid "Basket: " msgstr "Panier : " -#: counter/templates/counter/counter_click.jinja:95 +#: counter/templates/counter/counter_click.jinja:97 msgid "This basket is empty" msgstr "Votre panier est vide" -#: counter/templates/counter/counter_click.jinja:124 +#: counter/templates/counter/counter_click.jinja:150 msgid "Finish" msgstr "Terminer" -#: counter/templates/counter/counter_click.jinja:130 +#: counter/templates/counter/counter_click.jinja:161 #: counter/templates/counter/refilling_list.jinja:9 msgid "Refilling" msgstr "Rechargement" -#: counter/templates/counter/counter_click.jinja:140 +#: counter/templates/counter/counter_click.jinja:171 msgid "" "As a barman, you are not able to refill any account on your own. An admin " "should be connected on this counter for that. The customer can refill by " @@ -3978,7 +3999,7 @@ msgstr "" "vous même. Un admin doit être connecté sur ce comptoir pour cela. Le client " "peut recharger son compte en utilisant l'eboutic" -#: counter/templates/counter/counter_click.jinja:161 +#: counter/templates/counter/counter_click.jinja:192 msgid "No products available on this counter for this user" msgstr "Pas de produits disponnibles dans ce comptoir pour cet utilisateur" @@ -4426,7 +4447,7 @@ msgid "Clear" msgstr "Vider" #: eboutic/templates/eboutic/eboutic_main.jinja:72 -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:95 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:94 msgid "Validate" msgstr "Valider" @@ -4461,7 +4482,7 @@ msgstr "Solde restant : " msgid "Billing information" msgstr "Informations de facturation" -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:103 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:102 msgid "" "You must fill your billing infos if you want to pay with your credit\n" " card" @@ -4469,7 +4490,7 @@ msgstr "" "Vous devez renseigner vos coordonnées de facturation si vous voulez payer " "par carte bancaire" -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:108 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:107 msgid "" "\n" " The Crédit Agricole changed its policy related to the " @@ -4487,32 +4508,32 @@ msgstr "" "souhaitez payer par carte, vous devez rajouter un numéro de téléphone aux " "données que vous aviez déjà fourni." -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:124 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:123 msgid "Pay with credit card" msgstr "Payer avec une carte bancaire" -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:129 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:128 msgid "" "AE account payment disabled because your basket contains refilling items." msgstr "" "Paiement par compte AE désactivé parce que votre panier contient des bons de " "rechargement." -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:131 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:130 msgid "" "AE account payment disabled because you do not have enough money remaining." msgstr "" "Paiement par compte AE désactivé parce que votre solde est insuffisant." -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:136 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:135 msgid "Pay with Sith account" msgstr "Payer avec un compte AE" -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:147 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:146 msgid "Billing info registration success" msgstr "Informations de facturation enregistrées" -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:148 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:147 msgid "Billing info registration failure" msgstr "Echec de l'enregistrement des informations de facturation." @@ -4951,12 +4972,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:651 +#: sith/settings.py:652 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:651 +#: sith/settings.py:652 msgid "Drying" msgstr "Séchage" @@ -5152,10 +5173,6 @@ msgstr "signalant" msgid "reason" msgstr "raison" -#: pedagogy/templates/pedagogy/guide.jinja:5 -msgid "UV Guide" -msgstr "Guide des UVs" - #: pedagogy/templates/pedagogy/guide.jinja:59 #, python-format msgid "%(display_name)s" @@ -5471,372 +5488,372 @@ msgstr "Personne(s)" msgid "Identify users on pictures" msgstr "Identifiez les utilisateurs sur les photos" -#: sith/settings.py:253 sith/settings.py:470 +#: sith/settings.py:254 sith/settings.py:471 msgid "English" msgstr "Anglais" -#: sith/settings.py:253 sith/settings.py:469 +#: sith/settings.py:254 sith/settings.py:470 msgid "French" msgstr "Français" -#: sith/settings.py:397 +#: sith/settings.py:398 msgid "TC" msgstr "TC" -#: sith/settings.py:398 +#: sith/settings.py:399 msgid "IMSI" msgstr "IMSI" -#: sith/settings.py:399 +#: sith/settings.py:400 msgid "IMAP" msgstr "IMAP" -#: sith/settings.py:400 +#: sith/settings.py:401 msgid "INFO" msgstr "INFO" -#: sith/settings.py:401 +#: sith/settings.py:402 msgid "GI" msgstr "GI" -#: sith/settings.py:402 sith/settings.py:480 +#: sith/settings.py:403 sith/settings.py:481 msgid "E" msgstr "E" -#: sith/settings.py:403 +#: sith/settings.py:404 msgid "EE" msgstr "EE" -#: sith/settings.py:404 +#: sith/settings.py:405 msgid "GESC" msgstr "GESC" -#: sith/settings.py:405 +#: sith/settings.py:406 msgid "GMC" msgstr "GMC" -#: sith/settings.py:406 +#: sith/settings.py:407 msgid "MC" msgstr "MC" -#: sith/settings.py:407 +#: sith/settings.py:408 msgid "EDIM" msgstr "EDIM" -#: sith/settings.py:408 +#: sith/settings.py:409 msgid "Humanities" msgstr "Humanités" -#: sith/settings.py:409 +#: sith/settings.py:410 msgid "N/A" msgstr "N/A" -#: sith/settings.py:415 +#: sith/settings.py:416 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:428 +#: sith/settings.py:429 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:429 +#: sith/settings.py:430 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:430 +#: sith/settings.py:431 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:450 +#: sith/settings.py:451 msgid "Free" msgstr "Libre" -#: sith/settings.py:451 +#: sith/settings.py:452 msgid "CS" msgstr "CS" -#: sith/settings.py:452 +#: sith/settings.py:453 msgid "TM" msgstr "TM" -#: sith/settings.py:453 +#: sith/settings.py:454 msgid "OM" msgstr "OM" -#: sith/settings.py:454 +#: sith/settings.py:455 msgid "QC" msgstr "QC" -#: sith/settings.py:455 +#: sith/settings.py:456 msgid "EC" msgstr "EC" -#: sith/settings.py:456 +#: sith/settings.py:457 msgid "RN" msgstr "RN" -#: sith/settings.py:457 +#: sith/settings.py:458 msgid "ST" msgstr "ST" -#: sith/settings.py:458 +#: sith/settings.py:459 msgid "EXT" msgstr "EXT" -#: sith/settings.py:463 +#: sith/settings.py:464 msgid "Autumn" msgstr "Automne" -#: sith/settings.py:464 +#: sith/settings.py:465 msgid "Spring" msgstr "Printemps" -#: sith/settings.py:465 +#: sith/settings.py:466 msgid "Autumn and spring" msgstr "Automne et printemps" -#: sith/settings.py:471 +#: sith/settings.py:472 msgid "German" msgstr "Allemand" -#: sith/settings.py:472 +#: sith/settings.py:473 msgid "Spanish" msgstr "Espagnol" -#: sith/settings.py:476 +#: sith/settings.py:477 msgid "A" msgstr "A" -#: sith/settings.py:477 +#: sith/settings.py:478 msgid "B" msgstr "B" -#: sith/settings.py:478 +#: sith/settings.py:479 msgid "C" msgstr "C" -#: sith/settings.py:479 +#: sith/settings.py:480 msgid "D" msgstr "D" -#: sith/settings.py:481 +#: sith/settings.py:482 msgid "FX" msgstr "FX" -#: sith/settings.py:482 +#: sith/settings.py:483 msgid "F" msgstr "F" -#: sith/settings.py:483 +#: sith/settings.py:484 msgid "Abs" msgstr "Abs" -#: sith/settings.py:487 +#: sith/settings.py:488 msgid "Selling deletion" msgstr "Suppression de vente" -#: sith/settings.py:488 +#: sith/settings.py:489 msgid "Refilling deletion" msgstr "Suppression de rechargement" -#: sith/settings.py:532 +#: sith/settings.py:533 msgid "One semester" msgstr "Un semestre, 20 €" -#: sith/settings.py:533 +#: sith/settings.py:534 msgid "Two semesters" msgstr "Deux semestres, 35 €" -#: sith/settings.py:535 +#: sith/settings.py:536 msgid "Common core cursus" msgstr "Cursus tronc commun, 60 €" -#: sith/settings.py:539 +#: sith/settings.py:540 msgid "Branch cursus" msgstr "Cursus branche, 60 €" -#: sith/settings.py:540 +#: sith/settings.py:541 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:541 +#: sith/settings.py:542 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:542 +#: sith/settings.py:543 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:543 +#: sith/settings.py:544 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:544 +#: sith/settings.py:545 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:545 +#: sith/settings.py:546 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:546 +#: sith/settings.py:547 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 20 €" -#: sith/settings.py:548 +#: sith/settings.py:549 msgid "One semester Welcome Week" msgstr "Un semestre Welcome Week" -#: sith/settings.py:552 +#: sith/settings.py:553 msgid "One month for free" msgstr "Un mois gratuit" -#: sith/settings.py:553 +#: sith/settings.py:554 msgid "Two months for free" msgstr "Deux mois gratuits" -#: sith/settings.py:554 +#: sith/settings.py:555 msgid "Eurok's volunteer" msgstr "Bénévole Eurockéennes" -#: sith/settings.py:556 +#: sith/settings.py:557 msgid "Six weeks for free" msgstr "6 semaines gratuites" -#: sith/settings.py:560 +#: sith/settings.py:561 msgid "One day" msgstr "Un jour" -#: sith/settings.py:561 +#: sith/settings.py:562 msgid "GA staff member" msgstr "Membre staff GA (2 semaines), 1 €" -#: sith/settings.py:564 +#: sith/settings.py:565 msgid "One semester (-20%)" msgstr "Un semestre (-20%), 12 €" -#: sith/settings.py:569 +#: sith/settings.py:570 msgid "Two semesters (-20%)" msgstr "Deux semestres (-20%), 22 €" -#: sith/settings.py:574 +#: sith/settings.py:575 msgid "Common core cursus (-20%)" msgstr "Cursus tronc commun (-20%), 36 €" -#: sith/settings.py:579 +#: sith/settings.py:580 msgid "Branch cursus (-20%)" msgstr "Cursus branche (-20%), 36 €" -#: sith/settings.py:584 +#: sith/settings.py:585 msgid "Alternating cursus (-20%)" msgstr "Cursus alternant (-20%), 24 €" -#: sith/settings.py:590 +#: sith/settings.py:591 msgid "One year for free(CA offer)" msgstr "Une année offerte (Offre CA)" -#: sith/settings.py:610 +#: sith/settings.py:611 msgid "President" msgstr "Président⸱e" -#: sith/settings.py:611 +#: sith/settings.py:612 msgid "Vice-President" msgstr "Vice-Président⸱e" -#: sith/settings.py:612 +#: sith/settings.py:613 msgid "Treasurer" msgstr "Trésorier⸱e" -#: sith/settings.py:613 +#: sith/settings.py:614 msgid "Communication supervisor" msgstr "Responsable communication" -#: sith/settings.py:614 +#: sith/settings.py:615 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:615 +#: sith/settings.py:616 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:616 +#: sith/settings.py:617 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:617 +#: sith/settings.py:618 msgid "Active member" msgstr "Membre actif⸱ve" -#: sith/settings.py:618 +#: sith/settings.py:619 msgid "Curious" msgstr "Curieux⸱euse" -#: sith/settings.py:655 +#: sith/settings.py:656 msgid "A new poster needs to be moderated" msgstr "Une nouvelle affiche a besoin d'être modérée" -#: sith/settings.py:656 +#: sith/settings.py:657 msgid "A new mailing list needs to be moderated" msgstr "Une nouvelle mailing list a besoin d'être modérée" -#: sith/settings.py:659 +#: sith/settings.py:660 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:661 +#: sith/settings.py:662 #, 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:662 +#: sith/settings.py:663 msgid "New files to be moderated" msgstr "Nouveaux fichiers à modérer" -#: sith/settings.py:663 +#: sith/settings.py:664 #, 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:664 +#: sith/settings.py:665 msgid "You've been identified on some pictures" msgstr "Vous avez été identifié sur des photos" -#: sith/settings.py:665 +#: sith/settings.py:666 #, python-format msgid "You just refilled of %s €" msgstr "Vous avez rechargé votre compte de %s€" -#: sith/settings.py:666 +#: sith/settings.py:667 #, python-format msgid "You just bought %s" msgstr "Vous avez acheté %s" -#: sith/settings.py:667 +#: sith/settings.py:668 msgid "You have a notification" msgstr "Vous avez une notification" -#: sith/settings.py:679 +#: sith/settings.py:680 msgid "Success!" msgstr "Succès !" -#: sith/settings.py:680 +#: sith/settings.py:681 msgid "Fail!" msgstr "Échec !" -#: sith/settings.py:681 +#: sith/settings.py:682 msgid "You successfully posted an article in the Weekmail" msgstr "Article posté avec succès dans le Weekmail" -#: sith/settings.py:682 +#: sith/settings.py:683 msgid "You successfully edited an article in the Weekmail" msgstr "Article édité avec succès dans le Weekmail" -#: sith/settings.py:683 +#: sith/settings.py:684 msgid "You successfully sent the Weekmail" msgstr "Weekmail envoyé avec succès" -#: sith/settings.py:691 +#: sith/settings.py:692 msgid "AE tee-shirt" msgstr "Tee-shirt AE" @@ -6209,15 +6226,3 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée." #, python-format msgid "Maximum characters: %(max_length)s" msgstr "Nombre de caractères max: %(max_length)s" - -#~ msgid "Too young for that product" -#~ msgstr "Trop jeune pour ce produit" - -#~ msgid "Not allowed for that product" -#~ msgstr "Non autorisé pour ce produit" - -#~ msgid "No date of birth provided" -#~ msgstr "Pas de date de naissance renseignée" - -#~ msgid "You have not enough money to buy all the basket" -#~ msgstr "Vous n'avez pas assez d'argent pour acheter le panier"