From 457fc36e167dd1eae2ac214434729b728798b688 Mon Sep 17 00:00:00 2001 From: Skia Date: Sat, 10 Jun 2017 16:52:03 +0200 Subject: [PATCH] Fix markdown rendering on some pages, and add a link to the syntax help Signed-off-by: Skia --- core/static/core/style.scss | 20 ++- core/templatetags/renderer.py | 4 +- forum/templates/forum/reply.jinja | 8 +- forum/views.py | 3 + locale/fr/LC_MESSAGES/django.po | 269 +++++++++++++++--------------- sith/settings.py | 3 + 6 files changed, 166 insertions(+), 141 deletions(-) diff --git a/core/static/core/style.scss b/core/static/core/style.scss index 800f6f5e..894aa1a5 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -470,13 +470,11 @@ em { border: solid #333 2px; } -/*---------------------------------PAGE--------------------------------*/ +/*-------------------------------MARKDOWN------------------------------*/ -.page_content { - display: block; - margin: 10px; - padding: 10px; - background: $white-color; +.markdown { + margin: 0px; + padding: 0px; code { font-family: monospace; color: $white-color; @@ -487,8 +485,16 @@ em { } } +/*---------------------------------PAGE--------------------------------*/ + +.page_content { + display: block; + margin: 10px; + padding: 10px; + background: $white-color; +} + textarea { - white-space: pre; width: 98%; margin-top: 10px; } diff --git a/core/templatetags/renderer.py b/core/templatetags/renderer.py index 23ae8d03..32e1f435 100644 --- a/core/templatetags/renderer.py +++ b/core/templatetags/renderer.py @@ -36,7 +36,7 @@ register = template.Library() @register.filter(is_safe=False) @stringfilter def markdown(text): - return mark_safe(md(text)) + return mark_safe("
%s
" % md(text)) @register.filter() @stringfilter @@ -57,4 +57,4 @@ def scss(path): Return path of the corresponding css file after compilation """ processor = ScssProcessor(path) - return processor.get_converted_scss() \ No newline at end of file + return processor.get_converted_scss() diff --git a/forum/templates/forum/reply.jinja b/forum/templates/forum/reply.jinja index 9386cdf9..0afcd9bb 100644 --- a/forum/templates/forum/reply.jinja +++ b/forum/templates/forum/reply.jinja @@ -27,7 +27,11 @@ {% endif %}
{% csrf_token %} - {{ form.as_p() }} +

{{ form.title.errors }} {{ form.title }}

+

{{ form.message.errors }}

+

{% trans %}Help on the syntax{% endtrans %} + {{ form.message }} +

@@ -43,7 +47,7 @@
-
+
{{ user.forum_signature|markdown }}
diff --git a/forum/views.py b/forum/views.py index b8ab8ad1..21dcb5f6 100644 --- a/forum/views.py +++ b/forum/views.py @@ -38,6 +38,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from ajax_select import make_ajax_form, make_ajax_field from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin, TabedViewMixin +from core.models import Page from forum.models import Forum, ForumMessage, ForumTopic, ForumMessageMeta class ForumMainView(ListView): @@ -215,6 +216,7 @@ class ForumMessageEditView(CanEditMixin, UpdateView): def get_context_data(self, **kwargs): kwargs = super(ForumMessageEditView, self).get_context_data(**kwargs) kwargs['topic'] = self.object.topic + kwargs['syntax_help_page'] = Page.get_page_by_full_name(settings.SITH_CORE_PAGE_SYNTAX) return kwargs class ForumMessageDeleteView(SingleObjectMixin, RedirectView): @@ -271,5 +273,6 @@ class ForumMessageCreateView(CanCreateMixin, CreateView): def get_context_data(self, **kwargs): kwargs = super(ForumMessageCreateView, self).get_context_data(**kwargs) kwargs['topic'] = self.topic + kwargs['syntax_help_page'] = Page.get_page_by_full_name(settings.SITH_CORE_PAGE_SYNTAX) return kwargs diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 7aa41665..03fa0bc3 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: 2017-06-07 17:32+0200\n" +"POT-Creation-Date: 2017-06-10 16:53+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -88,12 +88,12 @@ msgid "%(club_account)s on %(bank_account)s" msgstr "%(club_account)s sur %(bank_account)s" #: accounting/models.py:192 club/models.py:184 counter/models.py:433 -#: election/models.py:17 launderette/models.py:144 +#: election/models.py:16 launderette/models.py:144 msgid "start date" msgstr "date de début" #: accounting/models.py:193 club/models.py:185 counter/models.py:434 -#: election/models.py:18 +#: election/models.py:17 msgid "end date" msgstr "date de fin" @@ -199,7 +199,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:267 sith/settings.py:362 +#: accounting/models.py:267 sith/settings.py:365 #: stock/templates/stock/shopping_list_items.jinja:37 msgid "Other" msgstr "Autre" @@ -334,13 +334,14 @@ msgstr "Compte en banque : " #: counter/templates/counter/last_ops.jinja:29 #: counter/templates/counter/last_ops.jinja:59 #: election/templates/election/election_detail.jinja:280 -#: election/templates/election/election_detail.jinja:329 -#: election/templates/election/election_detail.jinja:377 -#: forum/templates/forum/macros.jinja:21 forum/templates/forum/macros.jinja:123 +#: election/templates/election/election_detail.jinja:330 +#: election/templates/election/election_detail.jinja:378 +#: forum/templates/forum/macros.jinja:21 +#: forum/templates/forum/macros.jinja:123 #: launderette/templates/launderette/launderette_admin.jinja:16 #: launderette/views.py:178 sas/templates/sas/album.jinja:26 #: sas/templates/sas/moderation.jinja:18 sas/templates/sas/picture.jinja:74 -#: sas/templates/sas/picture.jinja.py:124 +#: sas/templates/sas/picture.jinja:124 #: stock/templates/stock/stock_shopping_list.jinja:43 #: stock/templates/stock/stock_shopping_list.jinja:69 #: trombi/templates/trombi/detail.jinja:28 @@ -378,8 +379,8 @@ msgstr "Nouveau compte club" #: counter/templates/counter/counter_list.jinja:32 #: counter/templates/counter/counter_list.jinja:53 #: election/templates/election/election_detail.jinja:279 -#: election/templates/election/election_detail.jinja:326 -#: election/templates/election/election_detail.jinja:374 +#: election/templates/election/election_detail.jinja:327 +#: election/templates/election/election_detail.jinja:375 #: forum/templates/forum/macros.jinja:20 forum/templates/forum/macros.jinja:62 #: forum/templates/forum/macros.jinja:117 #: launderette/templates/launderette/launderette_list.jinja:16 @@ -491,8 +492,8 @@ msgstr "Non" #: accounting/templates/accounting/club_account_details.jinja:56 #: com/templates/com/news_admin_list.jinja:38 -#: com/templates/com/news_admin_list.jinja:71 core/templates/core/file.jinja:36 -#: core/templates/core/page.jinja:28 +#: com/templates/com/news_admin_list.jinja:71 +#: core/templates/core/file.jinja:36 core/templates/core/page.jinja:28 msgid "View" msgstr "Voir" @@ -696,7 +697,7 @@ msgstr "Opération liée : " #: core/templates/core/user_preferences.jinja:12 #: core/templates/core/user_preferences.jinja:19 #: counter/templates/counter/cash_register_summary.jinja:22 -#: forum/templates/forum/reply.jinja:32 +#: forum/templates/forum/reply.jinja:36 #: subscription/templates/subscription/subscription.jinja:24 #: trombi/templates/trombi/comment.jinja:26 #: trombi/templates/trombi/user_tools.jinja:13 @@ -831,19 +832,19 @@ msgid "A club with that unix_name already exists" msgstr "Un club avec ce nom UNIX existe déjà." #: club/models.py:182 counter/models.py:431 counter/models.py:448 -#: eboutic/models.py:38 eboutic/models.py:71 election/models.py:147 +#: eboutic/models.py:38 eboutic/models.py:71 election/models.py:140 #: launderette/models.py:111 launderette/models.py:148 sas/models.py:156 msgid "user" msgstr "nom d'utilisateur" -#: club/models.py:186 core/models.py:169 election/models.py:145 -#: election/models.py:165 +#: club/models.py:186 core/models.py:169 election/models.py:139 +#: election/models.py:155 msgid "role" msgstr "rôle" #: club/models.py:188 core/models.py:61 counter/models.py:101 #: counter/models.py:126 election/models.py:13 election/models.py:93 -#: election/models.py:148 forum/models.py:51 forum/models.py:184 +#: election/models.py:141 forum/models.py:51 forum/models.py:184 msgid "description" msgstr "description" @@ -859,7 +860,8 @@ msgstr "L'utilisateur est déjà membre de ce club" msgid "past member" msgstr "Anciens membres" -#: club/templates/club/club_list.jinja:4 club/templates/club/club_list.jinja:24 +#: club/templates/club/club_list.jinja:4 +#: club/templates/club/club_list.jinja:24 msgid "Club list" msgstr "Liste des clubs" @@ -921,13 +923,14 @@ msgstr "Du" msgid "To" msgstr "Au" -#: club/templates/club/club_sellings.jinja:5 club/views.py:84 club/views.py:247 -#: counter/templates/counter/counter_main.jinja:19 +#: club/templates/club/club_sellings.jinja:5 club/views.py:84 +#: club/views.py:247 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 club/templates/club/stats.jinja:19 +#: club/templates/club/club_sellings.jinja:9 +#: club/templates/club/stats.jinja:19 #: counter/templates/counter/cash_summary_list.jinja:15 msgid "Show" msgstr "Montrer" @@ -983,8 +986,8 @@ msgstr "Quantité" #: counter/templates/counter/cash_summary_list.jinja:35 #: counter/templates/counter/last_ops.jinja:44 #: counter/templates/counter/stats.jinja:18 -#: subscription/templates/subscription/stats.jinja:33 -#: subscription/templates/subscription/stats.jinja:41 +#: subscription/templates/subscription/stats.jinja:40 +#: subscription/templates/subscription/stats.jinja:48 msgid "Total" msgstr "Total" @@ -1069,8 +1072,7 @@ msgid "Begin date" msgstr "Date de début" #: club/views.py:196 com/views.py:123 counter/views.py:1020 -#: election/views.py:131 subscription/views.py:50 -#: election/views.py:149 +#: election/views.py:135 subscription/views.py:50 msgid "End date" msgstr "Date de fin" @@ -1112,7 +1114,7 @@ msgid "Call" msgstr "Appel" #: com/models.py:60 com/models.py:102 com/models.py:149 election/models.py:12 -#: election/models.py:92 election/models.py:132 forum/models.py:187 +#: election/models.py:92 election/models.py:128 forum/models.py:187 #: forum/models.py:234 msgid "title" msgstr "titre" @@ -1188,8 +1190,9 @@ msgid "News admin" msgstr "Administration des nouvelles" #: com/templates/com/news_admin_list.jinja:9 -#: com/templates/com/news_detail.jinja:5 com/templates/com/news_detail.jinja:11 -#: com/templates/com/news_list.jinja:4 com/templates/com/news_list.jinja:28 +#: com/templates/com/news_detail.jinja:5 +#: com/templates/com/news_detail.jinja:11 com/templates/com/news_list.jinja:4 +#: com/templates/com/news_list.jinja:28 msgid "News" msgstr "Nouvelles" @@ -1208,7 +1211,7 @@ msgstr "Type" #: com/templates/com/news_admin_list.jinja:50 #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 #: forum/templates/forum/forum.jinja:27 forum/templates/forum/forum.jinja:46 -#: forum/templates/forum/main.jinja:25 forum/views.py:144 +#: forum/templates/forum/main.jinja:25 forum/views.py:145 msgid "Title" msgstr "Titre" @@ -1294,7 +1297,7 @@ msgstr "" #: com/templates/com/news_edit.jinja:55 com/templates/com/weekmail.jinja:10 #: core/templates/core/pagerev_edit.jinja:25 -#: forum/templates/forum/reply.jinja:31 +#: forum/templates/forum/reply.jinja:35 msgid "Preview" msgstr "Prévisualiser" @@ -1417,8 +1420,7 @@ msgstr "Message d'info" msgid "Alert message" msgstr "Message d'alerte" -#: com/views.py:122 election/views.py:130 subscription/views.py:47 -#: com/views.py:122 election/views.py:146 +#: com/views.py:122 election/views.py:133 subscription/views.py:47 msgid "Start date" msgstr "Date de début" @@ -1682,9 +1684,9 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" #: core/templates/core/user_detail.jinja:14 #: core/templates/core/user_detail.jinja:16 #: core/templates/core/user_edit.jinja:17 -#: election/templates/election/election_detail.jinja:316 +#: election/templates/election/election_detail.jinja:317 #: forum/templates/forum/macros.jinja:93 forum/templates/forum/macros.jinja:95 -#: forum/templates/forum/reply.jinja:37 forum/templates/forum/reply.jinja:39 +#: forum/templates/forum/reply.jinja:41 forum/templates/forum/reply.jinja:43 #: trombi/templates/trombi/user_tools.jinja:43 msgid "Profile" msgstr "Profil" @@ -1876,7 +1878,8 @@ msgstr "S'enregister" msgid "View more" msgstr "Voir plus" -#: core/templates/core/base.jinja:62 forum/templates/forum/last_unread.jinja:16 +#: core/templates/core/base.jinja:62 +#: forum/templates/forum/last_unread.jinja:16 msgid "Mark all as read" msgstr "Marquer tout commme lu" @@ -1908,7 +1911,7 @@ msgstr "SAS" #: core/templates/core/base.jinja:94 forum/templates/forum/forum.jinja:10 #: forum/templates/forum/last_unread.jinja:13 -#: forum/templates/forum/main.jinja:6 forum/templates/forum/main.jinja.py:11 +#: forum/templates/forum/main.jinja:6 forum/templates/forum/main.jinja:11 #: forum/templates/forum/main.jinja:14 forum/templates/forum/reply.jinja:15 #: forum/templates/forum/topic.jinja:30 msgid "Forum" @@ -2122,11 +2125,13 @@ msgstr "login" msgid "Lost password?" msgstr "Mot de passe perdu ?" -#: core/templates/core/macros.jinja:31 core/templates/core/user_detail.jinja:27 +#: core/templates/core/macros.jinja:31 +#: core/templates/core/user_detail.jinja:27 msgid "Born: " msgstr "Né le : " -#: core/templates/core/macros.jinja:35 core/templates/core/user_detail.jinja:48 +#: core/templates/core/macros.jinja:35 +#: core/templates/core/user_detail.jinja:48 msgid "Promo: " msgstr "Promo : " @@ -2713,23 +2718,23 @@ msgstr "Élections" msgid "See available elections" msgstr "Voir les élections disponibles" -#: core/templates/core/user_tools.jinja:105 +#: core/templates/core/user_tools.jinja:106 msgid "See archived elections" msgstr "Voir les élections archivées" -#: core/templates/core/user_tools.jinja:107 +#: core/templates/core/user_tools.jinja:108 msgid "Create a new election" msgstr "Créer une nouvelle élection" -#: core/templates/core/user_tools.jinja:110 +#: core/templates/core/user_tools.jinja:111 msgid "Other tools" msgstr "Autres outils" -#: core/templates/core/user_tools.jinja:112 +#: core/templates/core/user_tools.jinja:113 msgid "Convert dokuwiki/BBcode syntax to Markdown" msgstr "Convertir de la syntaxe dokuwiki/BBcode vers Markdown" -#: core/templates/core/user_tools.jinja:113 +#: core/templates/core/user_tools.jinja:114 msgid "Trombi tools" msgstr "Outils Trombi" @@ -2853,7 +2858,7 @@ msgstr "produit parent" msgid "buying groups" msgstr "groupe d'achat" -#: counter/models.py:140 election/models.py:34 +#: counter/models.py:140 election/models.py:36 msgid "archived" msgstr "archivé" @@ -2882,7 +2887,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:361 sith/settings.py:369 +#: sith/settings.py:364 sith/settings.py:372 msgid "Eboutic" msgstr "Eboutic" @@ -2923,8 +2928,8 @@ msgstr "quantité" msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:326 sith/settings.py:354 sith/settings.py:359 -#: sith/settings.py:381 +#: counter/models.py:326 sith/settings.py:357 sith/settings.py:362 +#: sith/settings.py:384 msgid "Credit card" msgstr "Carte bancaire" @@ -3084,7 +3089,7 @@ msgstr "Pas de date de naissance renseignée" #: launderette/templates/launderette/launderette_admin.jinja:35 #: launderette/templates/launderette/launderette_click.jinja:13 #: sas/templates/sas/picture.jinja:82 -#: subscription/templates/subscription/stats.jinja:14 +#: subscription/templates/subscription/stats.jinja:19 msgid "Go" msgstr "Valider" @@ -3439,15 +3444,15 @@ msgstr "Retourner à l'eboutic" msgid "You do not have enough money to buy the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: election/models.py:15 +#: election/models.py:14 msgid "start candidature" msgstr "début des candidatures" -#: election/models.py:16 +#: election/models.py:15 msgid "end candidature" msgstr "fin des candidatures" -#: election/models.py:22 +#: election/models.py:21 msgid "edit groups" msgstr "groupe d'édition" @@ -3455,15 +3460,15 @@ msgstr "groupe d'édition" msgid "view groups" msgstr "groupe de vue" -#: election/models.py:28 +#: election/models.py:29 msgid "vote groups" msgstr "groupe de vote" -#: election/models.py:31 +#: election/models.py:33 msgid "candidature groups" msgstr "groupe de candidature" -#: election/models.py:91 election/models.py:134 +#: election/models.py:91 election/models.py:129 msgid "election" msgstr "élection" @@ -3471,17 +3476,17 @@ msgstr "élection" msgid "max choice" msgstr "nombre de choix maxi" -#: election/models.py:151 +#: election/models.py:142 msgid "election list" msgstr "liste électorale" -#: election/models.py:167 +#: election/models.py:156 msgid "candidature" msgstr "candidature" #: election/templates/election/candidate_form.jinja:4 #: election/templates/election/candidate_form.jinja:13 -#: election/templates/election/election_detail.jinja:365 +#: election/templates/election/election_detail.jinja:366 msgid "Candidate" msgstr "Candidater" @@ -3523,41 +3528,41 @@ msgstr "Vous avez déjà soumis votre vote." msgid "You have voted in this election." msgstr "Vous avez déjà voté pour cette élection." -#: election/templates/election/election_detail.jinja:266 election/views.py:90 +#: election/templates/election/election_detail.jinja:266 election/views.py:82 msgid "Blank vote" msgstr "Vote blanc" -#: election/templates/election/election_detail.jinja:283 +#: election/templates/election/election_detail.jinja:284 msgid "You may choose up to" msgstr "Vous pouvez choisir jusqu'à" -#: election/templates/election/election_detail.jinja:283 +#: election/templates/election/election_detail.jinja:284 msgid "people." msgstr "personne(s)" -#: election/templates/election/election_detail.jinja:297 +#: election/templates/election/election_detail.jinja:298 msgid "Choose blank vote" msgstr "Choisir de voter blanc" -#: election/templates/election/election_detail.jinja:304 -#: election/templates/election/election_detail.jinja:344 +#: election/templates/election/election_detail.jinja:305 +#: election/templates/election/election_detail.jinja:345 msgid "votes" msgstr "votes" -#: election/templates/election/election_detail.jinja:337 +#: election/templates/election/election_detail.jinja:338 #: launderette/templates/launderette/launderette_book.jinja:12 msgid "Choose" msgstr "Choisir" -#: election/templates/election/election_detail.jinja:360 +#: election/templates/election/election_detail.jinja:361 msgid "Submit the vote !" msgstr "Envoyer le vote !" -#: election/templates/election/election_detail.jinja:368 +#: election/templates/election/election_detail.jinja:369 msgid "Add a new list" msgstr "Ajouter une nouvelle liste" -#: election/templates/election/election_detail.jinja:372 +#: election/templates/election/election_detail.jinja:373 msgid "Add a new role" msgstr "Ajouter un nouveau rôle" @@ -3582,23 +3587,23 @@ msgstr "au" msgid "Polls open from" msgstr "Votes ouverts du" -#: election/views.py:46 +#: election/views.py:43 msgid "You have selected too much candidates." msgstr "Vous avez sélectionné trop de candidats." -#: election/views.py:62 +#: election/views.py:58 msgid "User to candidate" msgstr "Utilisateur se présentant" -#: election/views.py:112 +#: election/views.py:102 msgid "This role already exists for this election" msgstr "Ce rôle existe déjà pour cette élection" -#: election/views.py:152 +#: election/views.py:137 msgid "Start candidature" msgstr "Début des candidatures" -#: election/views.py:155 +#: election/views.py:139 msgid "End candidature" msgstr "Fin des candidatures" @@ -3718,11 +3723,15 @@ msgstr "Voir les derniers messages non lus" msgid "Reply" msgstr "Répondre" -#: forum/views.py:98 +#: forum/templates/forum/reply.jinja:32 +msgid "Help on the syntax" +msgstr "Aide sur la syntaxe" + +#: forum/views.py:99 msgid "Apply rights and club owner recursively" msgstr "Appliquer les droits et le club propriétaire récursivement" -#: forum/views.py:257 +#: forum/views.py:259 #, python-format msgid "%(author)s said" msgstr "Citation de %(author)s" @@ -3783,12 +3792,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:519 +#: sith/settings.py:522 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:519 +#: sith/settings.py:522 msgid "Drying" msgstr "Séchage" @@ -3938,209 +3947,209 @@ msgstr "Anglais" msgid "French" msgstr "Français" -#: sith/settings.py:335 +#: sith/settings.py:338 msgid "TC" msgstr "TC" -#: sith/settings.py:336 +#: sith/settings.py:339 msgid "IMSI" msgstr "IMSI" -#: sith/settings.py:337 +#: sith/settings.py:340 msgid "IMAP" msgstr "IMAP" -#: sith/settings.py:338 +#: sith/settings.py:341 msgid "INFO" msgstr "INFO" -#: sith/settings.py:339 +#: sith/settings.py:342 msgid "GI" msgstr "GI" -#: sith/settings.py:340 +#: sith/settings.py:343 msgid "E" msgstr "E" -#: sith/settings.py:341 +#: sith/settings.py:344 msgid "EE" msgstr "EE" -#: sith/settings.py:342 +#: sith/settings.py:345 msgid "GESC" msgstr "GESC" -#: sith/settings.py:343 +#: sith/settings.py:346 msgid "GMC" msgstr "GMC" -#: sith/settings.py:344 +#: sith/settings.py:347 msgid "MC" msgstr "MC" -#: sith/settings.py:345 +#: sith/settings.py:348 msgid "EDIM" msgstr "EDIM" -#: sith/settings.py:346 +#: sith/settings.py:349 msgid "Humanities" msgstr "Humanités" -#: sith/settings.py:347 +#: sith/settings.py:350 msgid "N/A" msgstr "N/A" -#: sith/settings.py:351 sith/settings.py:358 sith/settings.py:379 +#: sith/settings.py:354 sith/settings.py:361 sith/settings.py:382 msgid "Check" msgstr "Chèque" -#: sith/settings.py:352 sith/settings.py:360 sith/settings.py:380 +#: sith/settings.py:355 sith/settings.py:363 sith/settings.py:383 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:353 +#: sith/settings.py:356 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:366 +#: sith/settings.py:369 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:367 +#: sith/settings.py:370 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:368 +#: sith/settings.py:371 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:412 +#: sith/settings.py:415 msgid "One semester" msgstr "Un semestre, 15 €" -#: sith/settings.py:417 +#: sith/settings.py:420 msgid "Two semesters" msgstr "Deux semestres, 28 €" -#: sith/settings.py:422 +#: sith/settings.py:425 msgid "Common core cursus" msgstr "Cursus tronc commun, 45 €" -#: sith/settings.py:427 +#: sith/settings.py:430 msgid "Branch cursus" msgstr "Cursus branche, 45 €" -#: sith/settings.py:432 +#: sith/settings.py:435 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:437 +#: sith/settings.py:440 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:442 +#: sith/settings.py:445 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:447 +#: sith/settings.py:450 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:452 +#: sith/settings.py:455 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:457 +#: sith/settings.py:460 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:462 +#: sith/settings.py:465 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 15 €" -#: sith/settings.py:484 +#: sith/settings.py:487 msgid "President" msgstr "Président" -#: sith/settings.py:485 +#: sith/settings.py:488 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:486 +#: sith/settings.py:489 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:487 +#: sith/settings.py:490 msgid "Communication supervisor" msgstr "Responsable communication" -#: sith/settings.py:488 +#: sith/settings.py:491 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:489 +#: sith/settings.py:492 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:490 +#: sith/settings.py:493 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:491 +#: sith/settings.py:494 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:492 +#: sith/settings.py:495 msgid "Curious" msgstr "Curieux" -#: sith/settings.py:526 +#: sith/settings.py:529 msgid "A fresh new to be moderated" msgstr "Une nouvelle toute neuve à modérer" -#: sith/settings.py:527 +#: sith/settings.py:530 msgid "New files to be moderated" msgstr "Nouveaux fichiers à modérer" -#: sith/settings.py:528 +#: sith/settings.py:531 msgid "New pictures/album to be moderated in the SAS" msgstr "Nouvelles photos/albums à modérer dans le SAS" -#: sith/settings.py:529 +#: sith/settings.py:532 msgid "You've been identified on some pictures" msgstr "Vous avez été identifié sur des photos" -#: sith/settings.py:530 +#: sith/settings.py:533 #, python-format msgid "You just refilled of %s €" msgstr "Vous avez rechargé votre compte de %s €" -#: sith/settings.py:531 +#: sith/settings.py:534 #, python-format msgid "You just bought %s" msgstr "Vous avez acheté %s" -#: sith/settings.py:532 +#: sith/settings.py:535 msgid "You have a notification" msgstr "Vous avez une notification" -#: sith/settings.py:536 +#: sith/settings.py:539 msgid "Success!" msgstr "Succès !" -#: sith/settings.py:537 +#: sith/settings.py:540 msgid "Fail!" msgstr "Échec !" -#: sith/settings.py:538 +#: sith/settings.py:541 msgid "You successfully posted an article in the Weekmail" msgstr "Article posté avec succès dans le Weekmail" -#: sith/settings.py:539 +#: sith/settings.py:542 msgid "You successfully edited an article in the Weekmail" msgstr "Article édité avec succès dans le Weekmail" -#: sith/settings.py:540 +#: sith/settings.py:543 msgid "You successfully sent the Weekmail" msgstr "Weekmail envoyé avec succès" @@ -4374,15 +4383,15 @@ msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période" msgid "Subscription error" msgstr "Erreur de cotisation" -#: subscription/templates/subscription/stats.jinja:18 +#: subscription/templates/subscription/stats.jinja:25 msgid "Total subscriptions" msgstr "Cotisations totales" -#: subscription/templates/subscription/stats.jinja:19 +#: subscription/templates/subscription/stats.jinja:26 msgid "Subscriptions by type" msgstr "Cotisations par type" -#: subscription/templates/subscription/stats.jinja:29 +#: subscription/templates/subscription/stats.jinja:36 msgid "Subscription type" msgstr "Type de cotisation" diff --git a/sith/settings.py b/sith/settings.py index 69f5fbc1..05568325 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -318,6 +318,9 @@ SITH_CLUB_REFOUND_ID = 89 SITH_COUNTER_REFOUND_ID = 38 SITH_PRODUCT_REFOUND_ID = 5 +# Pages +SITH_CORE_PAGE_SYNTAX = "Aide_sur_la_syntaxe" + # Forum SITH_FORUM_PAGE_LENGTH = 30