Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
2c61e797
Verified
Commit
2c61e797
authored
Nov 08, 2018
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Navbar translation improvements
parent
c2d92eb1
Pipeline
#1601
passed with stage
in 10 minutes and 43 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
66 deletions
+64
-66
core/templates/core/base.jinja
core/templates/core/base.jinja
+7
-9
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+57
-57
No files found.
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 BD
F
{%
endtrans
%}
</a>
<a
href=
"/page/bdf/"
>
{%
trans
%}
Bd
F
{%
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-0
6
00:
55
+0100
\n
"
"POT-Creation-Date: 2018-11-0
8
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:33
3
counter/models.py:119
#: com/models.py:248 core/templates/core/base.jinja:33
1
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:11
5
core/views/user.py:228
#: club/views.py:165 core/templates/core/base.jinja:11
3
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:34
3
forum/templates/forum/forum.jinja:29
#: core/templates/core/base.jinja:34
1
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:16
5
#: core/templates/core/base.jinja:16
3
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:35
6
#: core/models.py:214 core/templates/core/base.jinja:35
4
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:4
6
#: core/templates/core/base.jinja:4
5
msgid
"Username"
msgid
"Username"
msgstr
"Nom d'utilisateur"
msgstr
"Nom d'utilisateur"
#: core/templates/core/base.jinja:4
8
#: core/templates/core/base.jinja:4
7
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:5
2
core/templates/core/register.jinja:18
#: core/templates/core/base.jinja:5
1
core/templates/core/register.jinja:18
msgid
"Register"
msgid
"Register"
msgstr
"S'enregister"
msgstr
"S'enregister"
#: core/templates/core/base.jinja:7
7
core/templates/core/base.jinja:7
8
#: core/templates/core/base.jinja:7
5
core/templates/core/base.jinja:7
6
#: 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:10
4
#: core/templates/core/base.jinja:10
2
msgid
"View more"
msgid
"View more"
msgstr
"Voir plus"
msgstr
"Voir plus"
#: core/templates/core/base.jinja:10
8
#: core/templates/core/base.jinja:10
6
#: 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:11
8
#: core/templates/core/base.jinja:11
6
msgid
"Logout"
msgid
"Logout"
msgstr
"Déconnexion"
msgstr
"Déconnexion"
#: core/templates/core/base.jinja:1
51
#: core/templates/core/base.jinja:1
49
msgid
"Main"
msgid
"Main"
msgstr
"Accueil"
msgstr
"Accueil"
#: core/templates/core/base.jinja:15
3
#: core/templates/core/base.jinja:15
1
msgid
"Associations & Clubs"
msgid
"Associations & Clubs"
msgstr
"Associations & Clubs"
msgstr
"Associations & Clubs"
#: core/templates/core/base.jinja:15
7
#: core/templates/core/base.jinja:15
5
msgid
"
The
AE"
msgid
"AE"
msgstr
"L'AE"
msgstr
"L'AE"
#: core/templates/core/base.jinja:15
8
#: core/templates/core/base.jinja:15
6
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:15
9
#: core/templates/core/base.jinja:15
7
msgid
"
The BD
F"
msgid
"
Bd
F"
msgstr
"Le B
D
F"
msgstr
"Le B
d
F"
#: core/templates/core/base.jinja:1
60
#: core/templates/core/base.jinja:1
58
msgid
"
The
BDS"
msgid
"BDS"
msgstr
"Le BDS"
msgstr
"Le BDS"
#: core/templates/core/base.jinja:1
61
#: core/templates/core/base.jinja:1
59
msgid
"
The
CETU"
msgid
"CETU"
msgstr
"Le CETU"
msgstr
"Le CETU"
#: core/templates/core/base.jinja:16
9
#: core/templates/core/base.jinja:16
7
msgid
"Calendar"
msgid
"Calendar"
msgstr
"Calendrier"
msgstr
"Calendrier"
#: core/templates/core/base.jinja:1
70
#: core/templates/core/base.jinja:1
68
msgid
"Big event"
msgid
"Big event"
msgstr
"GA"
msgstr
"GA"
#: core/templates/core/base.jinja:17
3
#: core/templates/core/base.jinja:17
1
#: 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:17
4
#: core/templates/core/base.jinja:17
2
msgid
"Gallery"
msgid
"Gallery"
msgstr
"Photos"
msgstr
"Photos"
#: core/templates/core/base.jinja:17
5
counter/models.py:217
#: core/templates/core/base.jinja:17
3
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:17
7
#: core/templates/core/base.jinja:17
5
msgid
"Services"
msgid
"Services"
msgstr
"Services"
msgstr
"Services"
#: core/templates/core/base.jinja:1
81
#: core/templates/core/base.jinja:1
79
msgid
"Matmatronch"
msgid
"Matmatronch"
msgstr
"Matmatronch"
msgstr
"Matmatronch"
#: core/templates/core/base.jinja:18
2
launderette/models.py:44
#: core/templates/core/base.jinja:18
0
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:18
3
core/templates/core/file.jinja:20
#: core/templates/core/base.jinja:18
1
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:18
4
#: core/templates/core/base.jinja:18
2
msgid
"Pedagogy"
msgid
"Pedagogy"
msgstr
"Pédagogie"
msgstr
"Pédagogie"
#: core/templates/core/base.jinja:18
7
#: core/templates/core/base.jinja:18
5
msgid
"Sponsors"
msgid
"Sponsors"
msgstr
"Partenaires"
msgstr
"Partenaires"
#: core/templates/core/base.jinja:18
9
#: core/templates/core/base.jinja:18
7
msgid
"Help"
msgid
"Help"
msgstr
"Aide"
msgstr
"Aide"
#: core/templates/core/base.jinja:19
3
#: core/templates/core/base.jinja:19
1
msgid
"FAQ"
msgid
"FAQ"
msgstr
"FAQ"
msgstr
"FAQ"
#: core/templates/core/base.jinja:19
4
core/templates/core/base.jinja:23
6
#: core/templates/core/base.jinja:19
2
core/templates/core/base.jinja:23
4
msgid
"Contacts"
msgid
"Contacts"
msgstr
"Contacts"
msgstr
"Contacts"
#: core/templates/core/base.jinja:19
5
#: core/templates/core/base.jinja:19
3
msgid
"Wiki"
msgid
"Wiki"
msgstr
"Wiki"
msgstr
"Wiki"
#: core/templates/core/base.jinja:23
7
#: core/templates/core/base.jinja:23
5
msgid
"Legal notices"
msgid
"Legal notices"
msgstr
"Mentions légales"
msgstr
"Mentions légales"
#: core/templates/core/base.jinja:23
8
#: core/templates/core/base.jinja:23
6
msgid
"Intellectual property"
msgid
"Intellectual property"
msgstr
"Propriété intellectuelle"
msgstr
"Propriété intellectuelle"
#: core/templates/core/base.jinja:23
9
#: core/templates/core/base.jinja:23
7
msgid
"Help & Documentation"
msgid
"Help & Documentation"
msgstr
"Aide & Documentation"
msgstr
"Aide & Documentation"
#: core/templates/core/base.jinja:2
40
#: core/templates/core/base.jinja:2
38
msgid
"R&D"
msgid
"R&D"
msgstr
"R&D"
msgstr
"R&D"
#: core/templates/core/base.jinja:2
41
#: core/templates/core/base.jinja:2
39
msgid
"Former website"
msgid
"Former website"
msgstr
"Ancien site"
msgstr
"Ancien site"
#: core/templates/core/base.jinja:24
3
#: core/templates/core/base.jinja:24
1
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:3
40
#: core/templates/core/base.jinja:3
38
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:34
2
#: core/templates/core/base.jinja:34
0
msgid
"alternative text"
msgid
"alternative text"
msgstr
"texte alternatif"
msgstr
"texte alternatif"
#: core/templates/core/base.jinja:35
2
#: core/templates/core/base.jinja:35
0
msgid
"Image"
msgid
"Image"
msgstr
"Image"
msgstr
"Image"
#: core/templates/core/base.jinja:35
3
#: core/templates/core/base.jinja:35
1
msgid
"Link"
msgid
"Link"
msgstr
"Lien"
msgstr
"Lien"
#: core/templates/core/base.jinja:35
4
#: core/templates/core/base.jinja:35
2
msgid
"sup"
msgid
"sup"
msgstr
"exp"
msgstr
"exp"
#: core/templates/core/base.jinja:35
5
#: core/templates/core/base.jinja:35
3
msgid
"sub"
msgid
"sub"
msgstr
"ind"
msgstr
"ind"
#: core/templates/core/base.jinja:35
7
#: core/templates/core/base.jinja:35
5
msgid
"U"
msgid
"U"
msgstr
"S"
msgstr
"S"
#: core/templates/core/base.jinja:35
8
#: core/templates/core/base.jinja:35
6
msgid
"I"
msgid
"I"
msgstr
"I"
msgstr
"I"
#: core/templates/core/base.jinja:35
9
#: core/templates/core/base.jinja:35
7
msgid
"B"
msgid
"B"
msgstr
"G"
msgstr
"G"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment