Skip to content

GitLab

Verified Commit 2c61e797 authored by Sli's avatar Sli
Browse files
Options

Navbar translation improvements

parent c2d92eb1
Pipeline #1601 passed with stage
    in 10 minutes and 43 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 64 additions and 66 deletions
    core/templates/core/base.jinja
    View file @ 2c61e797
    ...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
    <header> <header>
    {% if not user.is_authenticated() %} {% if not user.is_authenticated() %}
    <div id="header_logo" style="background-image: url('{{ <div id="header_logo" style="background-image: url('{{ static('core/img/logo.png') }}'); width: 185px; height: 100px;">
    static('core/img/logo.png') }}'); width: 185px; height: 100px;">
    <a href="{{ url('core:index') }}"></a> <a href="{{ url('core:index') }}"></a>
    </div> </div>
    <div id="header_connect_links"> <div id="header_connect_links">
    ...@@ -52,8 +51,7 @@ ...@@ -52,8 +51,7 @@
    <a href="{{ url('core:register') }}"><button type="button">{% trans %}Register{% endtrans %}</button></a> <a href="{{ url('core:register') }}"><button type="button">{% trans %}Register{% endtrans %}</button></a>
    </div> </div>
    {% else %} {% else %}
    <div id="header_logo" style="background-image: url('{{ <div id="header_logo" style="background-image: url('{{ static('core/img/logo.png') }}'); width: 92px; height: 52px;">
    static('core/img/logo.png') }}'); width: 92px; height: 52px;">
    <a href="{{ url('core:index') }}"></a> <a href="{{ url('core:index') }}"></a>
    </div> </div>
    <div id="header_bar"> <div id="header_bar">
    ...@@ -154,11 +152,11 @@ ...@@ -154,11 +152,11 @@
    <i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
    </button> </button>
    <div class="dropdown-content"> <div class="dropdown-content">
    <a href="/page/ae/">{% trans %}The AE{% endtrans %}</a> <a href="/page/ae/">{% trans %}AE{% endtrans %}</a>
    <a href="{{ url('core:page', page_name='clubs') }}">{% trans %}The AE's clubs{% endtrans %}</a> <a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a>
    <a href="/page/bdf/">{% trans %}The BDF{% endtrans %}</a> <a href="/page/bdf/">{% trans %}BdF{% endtrans %}</a>
    <a href="/page/bds/">{% trans %}The BDS{% endtrans %}</a> <a href="/page/bds/">{% trans %}BDS{% endtrans %}</a>
    <a href="/page/cetu/">{% trans %}The CETU{% endtrans %}</a> <a href="/page/cetu/">{% trans %}CETU{% endtrans %}</a>
    </div> </div>
    </div> </div>
    <div class="dropdown"> <div class="dropdown">
    ......
    locale/fr/LC_MESSAGES/django.po
    View file @ 2c61e797
    ...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
    msgid "" msgid ""
    msgstr "" msgstr ""
    "Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
    "POT-Creation-Date: 2018-11-06 00:55+0100\n" "POT-Creation-Date: 2018-11-08 00:26+0100\n"
    "PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
    "Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
    "Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
    ...@@ -18,7 +18,7 @@ msgstr "" ...@@ -18,7 +18,7 @@ msgstr ""
    #: accounting/models.py:61 accounting/models.py:110 accounting/models.py:138 #: accounting/models.py:61 accounting/models.py:110 accounting/models.py:138
    #: accounting/models.py:203 club/models.py:48 com/models.py:231 #: accounting/models.py:203 club/models.py:48 com/models.py:231
    #: com/models.py:248 core/templates/core/base.jinja:333 counter/models.py:119 #: com/models.py:248 core/templates/core/base.jinja:331 counter/models.py:119
    #: counter/models.py:147 counter/models.py:209 forum/models.py:58 #: counter/models.py:147 counter/models.py:209 forum/models.py:58
    #: launderette/models.py:38 launderette/models.py:90 launderette/models.py:125 #: launderette/models.py:38 launderette/models.py:90 launderette/models.py:125
    #: stock/models.py:40 stock/models.py:60 stock/models.py:100 #: stock/models.py:40 stock/models.py:60 stock/models.py:100
    ...@@ -1255,7 +1255,7 @@ msgstr "Anciens membres" ...@@ -1255,7 +1255,7 @@ msgstr "Anciens membres"
    msgid "History" msgid "History"
    msgstr "Historique" msgstr "Historique"
    #: club/views.py:165 core/templates/core/base.jinja:115 core/views/user.py:228 #: club/views.py:165 core/templates/core/base.jinja:113 core/views/user.py:228
    #: sas/templates/sas/picture.jinja:95 trombi/views.py:60 #: sas/templates/sas/picture.jinja:95 trombi/views.py:60
    msgid "Tools" msgid "Tools"
    msgstr "Outils" msgstr "Outils"
    ...@@ -1492,7 +1492,7 @@ msgstr "Type" ...@@ -1492,7 +1492,7 @@ msgstr "Type"
    #: com/templates/com/news_admin_list.jinja:249 #: com/templates/com/news_admin_list.jinja:249
    #: com/templates/com/news_admin_list.jinja:286 #: com/templates/com/news_admin_list.jinja:286
    #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48
    #: core/templates/core/base.jinja:343 forum/templates/forum/forum.jinja:29 #: core/templates/core/base.jinja:341 forum/templates/forum/forum.jinja:29
    #: forum/templates/forum/forum.jinja:48 forum/templates/forum/main.jinja:26 #: forum/templates/forum/forum.jinja:48 forum/templates/forum/main.jinja:26
    #: forum/views.py:192 #: forum/views.py:192
    msgid "Title" msgid "Title"
    ...@@ -1571,7 +1571,7 @@ msgid "Calls to moderate" ...@@ -1571,7 +1571,7 @@ msgid "Calls to moderate"
    msgstr "Appels à modérer" msgstr "Appels à modérer"
    #: com/templates/com/news_admin_list.jinja:242 #: com/templates/com/news_admin_list.jinja:242
    #: core/templates/core/base.jinja:165 #: core/templates/core/base.jinja:163
    msgid "Events" msgid "Events"
    msgstr "Événements" msgstr "Événements"
    ...@@ -2000,7 +2000,7 @@ msgstr "-" ...@@ -2000,7 +2000,7 @@ msgstr "-"
    msgid "XS" msgid "XS"
    msgstr "XS" msgstr "XS"
    #: core/models.py:214 core/templates/core/base.jinja:356 #: core/models.py:214 core/templates/core/base.jinja:354
    msgid "S" msgid "S"
    msgstr "S" msgstr "S"
    ...@@ -2292,80 +2292,80 @@ msgstr "500, Erreur Serveur" ...@@ -2292,80 +2292,80 @@ msgstr "500, Erreur Serveur"
    msgid "Welcome!" msgid "Welcome!"
    msgstr "Bienvenue!" msgstr "Bienvenue!"
    #: core/templates/core/base.jinja:46 #: core/templates/core/base.jinja:45
    msgid "Username" msgid "Username"
    msgstr "Nom d'utilisateur" msgstr "Nom d'utilisateur"
    #: core/templates/core/base.jinja:48 #: core/templates/core/base.jinja:47
    msgid "Password" msgid "Password"
    msgstr "Mot de passe" msgstr "Mot de passe"
    #: core/templates/core/base.jinja:50 core/templates/core/login.jinja:4 #: core/templates/core/base.jinja:49 core/templates/core/login.jinja:4
    #: core/templates/core/password_reset_complete.jinja:5 #: core/templates/core/password_reset_complete.jinja:5
    msgid "Login" msgid "Login"
    msgstr "Connexion" msgstr "Connexion"
    #: core/templates/core/base.jinja:52 core/templates/core/register.jinja:18 #: core/templates/core/base.jinja:51 core/templates/core/register.jinja:18
    msgid "Register" msgid "Register"
    msgstr "S'enregister" msgstr "S'enregister"
    #: core/templates/core/base.jinja:77 core/templates/core/base.jinja:78 #: core/templates/core/base.jinja:75 core/templates/core/base.jinja:76
    #: matmat/templates/matmat/search_form.jinja:37 #: matmat/templates/matmat/search_form.jinja:37
    #: matmat/templates/matmat/search_form.jinja:47 #: matmat/templates/matmat/search_form.jinja:47
    #: matmat/templates/matmat/search_form.jinja:58 #: matmat/templates/matmat/search_form.jinja:58
    msgid "Search" msgid "Search"
    msgstr "Recherche" msgstr "Recherche"
    #: core/templates/core/base.jinja:104 #: core/templates/core/base.jinja:102
    msgid "View more" msgid "View more"
    msgstr "Voir plus" msgstr "Voir plus"
    #: core/templates/core/base.jinja:108 #: core/templates/core/base.jinja:106
    #: forum/templates/forum/last_unread.jinja:17 #: forum/templates/forum/last_unread.jinja:17
    msgid "Mark all as read" msgid "Mark all as read"
    msgstr "Marquer tout commme lu" msgstr "Marquer tout commme lu"
    #: core/templates/core/base.jinja:118 #: core/templates/core/base.jinja:116
    msgid "Logout" msgid "Logout"
    msgstr "Déconnexion" msgstr "Déconnexion"
    #: core/templates/core/base.jinja:151 #: core/templates/core/base.jinja:149
    msgid "Main" msgid "Main"
    msgstr "Accueil" msgstr "Accueil"
    #: core/templates/core/base.jinja:153 #: core/templates/core/base.jinja:151
    msgid "Associations & Clubs" msgid "Associations & Clubs"
    msgstr "Associations & Clubs" msgstr "Associations & Clubs"
    #: core/templates/core/base.jinja:157 #: core/templates/core/base.jinja:155
    msgid "The AE" msgid "AE"
    msgstr "L'AE" msgstr "L'AE"
    #: core/templates/core/base.jinja:158 #: core/templates/core/base.jinja:156
    msgid "The AE's clubs" msgid "AE's clubs"
    msgstr "Les clubs de L'AE" msgstr "Les clubs de L'AE"
    #: core/templates/core/base.jinja:159 #: core/templates/core/base.jinja:157
    msgid "The BDF" msgid "BdF"
    msgstr "Le BDF" msgstr "Le BdF"
    #: core/templates/core/base.jinja:160 #: core/templates/core/base.jinja:158
    msgid "The BDS" msgid "BDS"
    msgstr "Le BDS" msgstr "Le BDS"
    #: core/templates/core/base.jinja:161 #: core/templates/core/base.jinja:159
    msgid "The CETU" msgid "CETU"
    msgstr "Le CETU" msgstr "Le CETU"
    #: core/templates/core/base.jinja:169 #: core/templates/core/base.jinja:167
    msgid "Calendar" msgid "Calendar"
    msgstr "Calendrier" msgstr "Calendrier"
    #: core/templates/core/base.jinja:170 #: core/templates/core/base.jinja:168
    msgid "Big event" msgid "Big event"
    msgstr "GA" msgstr "GA"
    #: core/templates/core/base.jinja:173 #: core/templates/core/base.jinja:171
    #: forum/templates/forum/favorite_topics.jinja:14 #: forum/templates/forum/favorite_topics.jinja:14
    #: forum/templates/forum/forum.jinja:10 #: forum/templates/forum/forum.jinja:10
    #: forum/templates/forum/last_unread.jinja:14 #: forum/templates/forum/last_unread.jinja:14
    ...@@ -2375,11 +2375,11 @@ msgstr "GA" ...@@ -2375,11 +2375,11 @@ msgstr "GA"
    msgid "Forum" msgid "Forum"
    msgstr "Forum" msgstr "Forum"
    #: core/templates/core/base.jinja:174 #: core/templates/core/base.jinja:172
    msgid "Gallery" msgid "Gallery"
    msgstr "Photos" msgstr "Photos"
    #: core/templates/core/base.jinja:175 counter/models.py:217 #: core/templates/core/base.jinja:173 counter/models.py:217
    #: counter/templates/counter/counter_list.jinja:11 #: counter/templates/counter/counter_list.jinja:11
    #: eboutic/templates/eboutic/eboutic_main.jinja:4 #: eboutic/templates/eboutic/eboutic_main.jinja:4
    #: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_main.jinja:24
    ...@@ -2389,107 +2389,107 @@ msgstr "Photos" ...@@ -2389,107 +2389,107 @@ msgstr "Photos"
    msgid "Eboutic" msgid "Eboutic"
    msgstr "Eboutic" msgstr "Eboutic"
    #: core/templates/core/base.jinja:177 #: core/templates/core/base.jinja:175
    msgid "Services" msgid "Services"
    msgstr "Services" msgstr "Services"
    #: core/templates/core/base.jinja:181 #: core/templates/core/base.jinja:179
    msgid "Matmatronch" msgid "Matmatronch"
    msgstr "Matmatronch" msgstr "Matmatronch"
    #: core/templates/core/base.jinja:182 launderette/models.py:44 #: core/templates/core/base.jinja:180 launderette/models.py:44
    #: launderette/templates/launderette/launderette_book.jinja:5 #: launderette/templates/launderette/launderette_book.jinja:5
    #: launderette/templates/launderette/launderette_book_choose.jinja:4 #: launderette/templates/launderette/launderette_book_choose.jinja:4
    #: launderette/templates/launderette/launderette_main.jinja:4 #: launderette/templates/launderette/launderette_main.jinja:4
    msgid "Launderette" msgid "Launderette"
    msgstr "Laverie" msgstr "Laverie"
    #: core/templates/core/base.jinja:183 core/templates/core/file.jinja:20 #: core/templates/core/base.jinja:181 core/templates/core/file.jinja:20
    #: core/views/files.py:86 #: core/views/files.py:86
    msgid "Files" msgid "Files"
    msgstr "Fichiers" msgstr "Fichiers"
    #: core/templates/core/base.jinja:184 #: core/templates/core/base.jinja:182
    msgid "Pedagogy" msgid "Pedagogy"
    msgstr "Pédagogie" msgstr "Pédagogie"
    #: core/templates/core/base.jinja:187 #: core/templates/core/base.jinja:185
    msgid "Sponsors" msgid "Sponsors"
    msgstr "Partenaires" msgstr "Partenaires"
    #: core/templates/core/base.jinja:189 #: core/templates/core/base.jinja:187
    msgid "Help" msgid "Help"
    msgstr "Aide" msgstr "Aide"
    #: core/templates/core/base.jinja:193 #: core/templates/core/base.jinja:191
    msgid "FAQ" msgid "FAQ"
    msgstr "FAQ" msgstr "FAQ"
    #: core/templates/core/base.jinja:194 core/templates/core/base.jinja:236 #: core/templates/core/base.jinja:192 core/templates/core/base.jinja:234
    msgid "Contacts" msgid "Contacts"
    msgstr "Contacts" msgstr "Contacts"
    #: core/templates/core/base.jinja:195 #: core/templates/core/base.jinja:193
    msgid "Wiki" msgid "Wiki"
    msgstr "Wiki" msgstr "Wiki"
    #: core/templates/core/base.jinja:237 #: core/templates/core/base.jinja:235
    msgid "Legal notices" msgid "Legal notices"
    msgstr "Mentions légales" msgstr "Mentions légales"
    #: core/templates/core/base.jinja:238 #: core/templates/core/base.jinja:236
    msgid "Intellectual property" msgid "Intellectual property"
    msgstr "Propriété intellectuelle" msgstr "Propriété intellectuelle"
    #: core/templates/core/base.jinja:239 #: core/templates/core/base.jinja:237
    msgid "Help & Documentation" msgid "Help & Documentation"
    msgstr "Aide & Documentation" msgstr "Aide & Documentation"
    #: core/templates/core/base.jinja:240 #: core/templates/core/base.jinja:238
    msgid "R&D" msgid "R&D"
    msgstr "R&D" msgstr "R&D"
    #: core/templates/core/base.jinja:241 #: core/templates/core/base.jinja:239
    msgid "Former website" msgid "Former website"
    msgstr "Ancien site" msgstr "Ancien site"
    #: core/templates/core/base.jinja:243 #: core/templates/core/base.jinja:241
    msgid "Site made by good people" msgid "Site made by good people"
    msgstr "Site réalisé par des gens bons" msgstr "Site réalisé par des gens bons"
    #: core/templates/core/base.jinja:340 #: core/templates/core/base.jinja:338
    msgid "https://path/to/image.gif" msgid "https://path/to/image.gif"
    msgstr "https://chemin/vers/image.gif" msgstr "https://chemin/vers/image.gif"
    #: core/templates/core/base.jinja:342 #: core/templates/core/base.jinja:340
    msgid "alternative text" msgid "alternative text"
    msgstr "texte alternatif" msgstr "texte alternatif"
    #: core/templates/core/base.jinja:352 #: core/templates/core/base.jinja:350
    msgid "Image" msgid "Image"
    msgstr "Image" msgstr "Image"
    #: core/templates/core/base.jinja:353 #: core/templates/core/base.jinja:351
    msgid "Link" msgid "Link"
    msgstr "Lien" msgstr "Lien"
    #: core/templates/core/base.jinja:354 #: core/templates/core/base.jinja:352
    msgid "sup" msgid "sup"
    msgstr "exp" msgstr "exp"
    #: core/templates/core/base.jinja:355 #: core/templates/core/base.jinja:353
    msgid "sub" msgid "sub"
    msgstr "ind" msgstr "ind"
    #: core/templates/core/base.jinja:357 #: core/templates/core/base.jinja:355
    msgid "U" msgid "U"
    msgstr "S" msgstr "S"
    #: core/templates/core/base.jinja:358 #: core/templates/core/base.jinja:356
    msgid "I" msgid "I"
    msgstr "I" msgstr "I"
    #: core/templates/core/base.jinja:359 #: core/templates/core/base.jinja:357
    msgid "B" msgid "B"
    msgstr "G" msgstr "G"
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment