Commit 17f38673 authored by klafyvel's avatar klafyvel

Merge branch 'master' into 'clean_api_duplicate'

# Conflicts:
#   CHANGELOG.md
parents 654da8cb 48546034
......@@ -46,6 +46,14 @@ install_re2o.sh help
## MR 176: Add awesome Logo
Add the logo and fix somme issues on the navbar and home page. Only collecting the statics is needed:
```
python3 manage.py collectstatic
```
## MR 172: Refactor API
Creates a new (nearly) REST API to expose all models of Re2o. See [the dedicated wiki page](https://gitlab.federez.net/federez/re2o/wikis/API/Raw-Usage) for more details on how to use it.
......@@ -63,6 +71,4 @@ OPTIONAL_APPS = (
...
'api',
...
)
```
)
\ No newline at end of file
......@@ -42,6 +42,8 @@ def context_user(request):
return {
'request_user': user,
'interfaces': interfaces,
'site_name': GeneralOption.get_cached_value('site_name'),
# Must takes a different name because djang.auth.contrib.views.login()
# overrides 'site_name' context variable.
'name_website': GeneralOption.get_cached_value('site_name'),
'ipv6_enabled': OptionalMachine.get_cached_value('ipv6'),
}
......@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-31 14:05+0000\n"
"POT-Creation-Date: 2018-06-23 18:26+0200\n"
"PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Maël Kervella <dev@maelkervella.eu>\n"
"Language-Team: \n"
......@@ -77,17 +77,17 @@ msgstr ""
"\n"
" Re2o est un outil d'administration initié par\n"
" <a href=\"https://rezometz.org/\">Rezo Supelec Metz</a> et quelques\n"
" membres d'autres assocations de "
"<a href=\"https://federez.net\">FedeRez</a>\n"
" membres d'autres assocations de <a href=\"https://federez.net"
"\">FedeRez</a>\n"
" autour de l'été 2016.<br />\n"
" Il se veut être un outil idépendant de toute infrastructure réseau\n"
" pour pouvoir être installé en \"quelques étapes\". Cet outil est "
"entièrement gratuit et\n"
" est disponible sous license GNU Public License v2 (GPLv2) sur le\n"
" <a href=\"https://gitlab.federez.net/federez/re2o/\">gitlab de FedeRez"
"</a>.<br />\n"
" Les mainteneurs de Re2o sont de fiers bénévoles venant principalement "
"d'écoles d'ingénieurs françaises\n"
" <a href=\"https://gitlab.federez.net/federez/re2o/\">gitlab de "
"FedeRez</a>.<br />\n"
" Les mainteneurs de Re2o sont de fiers bénévoles venant "
"principalement d'écoles d'ingénieurs françaises\n"
" (mais pas seulement) qui ont donné beaucoup de leur temps pour faire "
"en sorte que\n"
" ce projet soit possible. Donc s'il vous plait soyez gentils avez eux."
......@@ -155,14 +155,19 @@ msgstr ""
msgid "Dependencies"
msgstr "Dépendances"
#: templates/re2o/buttons/setlang.html:34
msgid "Translation in development"
msgstr "Traduction en développement"
#: templates/re2o/index.html:30
msgid "Home"
msgstr "Accueil"
#: views.py:172
msgid "No Git repository configured"
msgstr "Aucun repository git configuré"
#: templates/re2o/index.html:33
#, python-format
msgid "Welcome to %(name_website)s !"
msgstr "Bienvenue sur %(name_website)s !"
#: templates/re2o/index.html:47
msgid "Go there"
msgstr "Accéder"
#: views.py:178
#: views.py:205
msgid "Unable to get the information"
msgstr "Impossible d'obtenir l'information"
......@@ -25,11 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load bootstrap3 %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Accueil{% endblock %}
{% block title %}{% trans "Home" %}{% endblock %}
{% block content %}
<h1>Bienvenue sur {{ request.get_host }} !</h1>
<h1>{% blocktrans %}Welcome to {{ name_website }} !{% endblocktrans %}</h1>
<div class="row">
{% for service_list in services_urls %}
......@@ -38,12 +39,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="col-12">
<div class="thumbnail">
{% if service.image %}
<a href="{{ service.url }}"><img src="{{ service.image.url }}" alt="{{ service.name }}"></a>
<a href="{{ service.url }}"><img src="{{ service.image.url }}" alt="{{ service.name }}"></a>
{% endif %}
<div class="caption">
<h3>{{ service.name }}</h3>
<p>{{ service.description }}</p>
<p><a href="{{ service.url }}" class="btn btn-primary" role="button">Accéder</a></p>
<p><a href="{{ service.url }}" class="btn btn-primary" role="button">{% trans "Go there" %}</a></p>
</div>
</div>
</div>
......
......@@ -35,6 +35,18 @@ footer a {
border-radius: 0;
}
/* Reduce the padding for the logo in the navbar-brand so the 32px-high logo
* is centered in the navbar */
.navbar-brand {
padding-top: 9px;
padding-bottom: 9px;
}
/* Display logo and site name side by side and not on top of each other */
.navbar-brand img {
display: initial;
}
/* Add right colors for buttons in dropdown in navbar-inverse (else it is light
* gray on white bg and white when hovered */
.navbar-inverse .dropdown-menu .btn-link {
......
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Calque_1"
x="0px"
y="0px"
viewBox="0 0 128 128"
xml:space="preserve"
sodipodi:docname="logo_re2o.svg"
width="128"
height="128"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata3852"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs3850" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1853"
inkscape:window-height="1025"
id="namedview3848"
showgrid="false"
inkscape:zoom="1.4177726"
inkscape:cx="214.81788"
inkscape:cy="184.70713"
inkscape:window-x="67"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Calque_1" />
<style
type="text/css"
id="style3821">
.st0{fill:#ED2024;}
.st1{stroke:#000000;stroke-miterlimit:10;}
.st2{fill:#F9A01B;}
.st3{fill:#FFFFFF;}
.st4{fill:#E64F25;}
</style>
<path
class="st0"
d="M 84.261307,119.9821 H 16.72362 c -4.716918,0 -8.5762149,-3.86577 -8.5762149,-8.5906 V 43.812082 c 2.9302069,1.07383 6.0748189,1.57494 9.3623679,1.57494 2.429927,0 4.859854,-0.28635 7.075376,-0.93064 v 50.39821 c 0,4.72483 3.859297,8.590598 8.576215,8.590598 h 50.242321 c -0.571748,2.21924 -0.857621,4.51007 -0.857621,6.94407 0,3.43624 0.643216,6.58613 1.715243,9.59284 z"
id="path3823"
inkscape:connector-curvature="0"
style="fill:#ed2024;stroke-width:0.71528381" />
<path
class="st0"
d="m 119.8526,16.751682 v 67.36465 c -2.93021,-1.07382 -6.07482,-1.57494 -9.36237,-1.57494 -2.42993,0 -4.85986,0.28635 -7.07538,0.93065 v -50.18345 c 0,-4.72483 -3.859294,-8.5906 -8.576212,-8.5906 h -50.31379 c 0.571748,-2.29083 0.92909,-4.65325 0.92909,-7.08725 0,-3.29307 -0.571748,-6.44295 -1.572306,-9.3780798 h 67.466218 c 4.64545,-0.0716 8.50475,3.7941898 8.50475,8.5190198 z"
id="path3825"
inkscape:connector-curvature="0"
style="fill:#ed2024;stroke-width:0.71528381" />
<path
class="st1"
d="m 104.55835,96.214772 c -3.8593,1.57494 -6.860974,4.724828 -8.43328,8.590598 L 73.255165,81.897092 45.954217,54.550342 23.084312,31.642062 c 3.859296,-1.57495 6.93244,-4.65325 8.504746,-8.51902 l 24.084869,24.12528 24.87102,24.91275 z"
id="path3827"
inkscape:connector-curvature="0"
style="stroke:#000000;stroke-width:0.71528381;stroke-miterlimit:10" />
<g
id="g3833"
transform="matrix(0.71468453,0,0,0.71588367,-231.27192,-117.61969)">
<path
class="st2"
d="m 478.2,341.5 c -12.7,0 -23,-10.3 -23,-23 0,-2.9 0.5,-5.7 1.6,-8.3 2.2,-5.8 6.8,-10.5 12.6,-12.9 2.8,-1.2 5.8,-1.8 8.8,-1.8 12.7,0 23,10.3 23,23 0,12.7 -10.3,23 -23,23 z"
id="path3829"
inkscape:connector-curvature="0"
style="fill:#f9a01b" />
<path
class="st3"
d="m 478.2,297.1 c 11.9,0 21.5,9.6 21.5,21.5 0,11.9 -9.6,21.5 -21.5,21.5 -11.9,0 -21.5,-9.6 -21.5,-21.5 0,-2.8 0.5,-5.4 1.5,-7.8 2.1,-5.4 6.4,-9.8 11.8,-12 2.5,-1.1 5.3,-1.7 8.2,-1.7 m 0,-3 c -3.3,0 -6.5,0.6 -9.4,1.9 -6.1,2.5 -11,7.5 -13.4,13.7 -1.1,2.8 -1.7,5.8 -1.7,8.9 0,13.5 11,24.5 24.5,24.5 13.5,0 24.5,-11 24.5,-24.5 0,-13.5 -11,-24.5 -24.5,-24.5 z"
id="path3831"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
</g>
<g
id="g3839"
transform="matrix(0.71468453,0,0,0.71588367,-231.27192,-117.61969)">
<path
class="st2"
d="m 348.1,211.7 c -12.7,0 -23,-10.3 -23,-23 0,-12.7 10.3,-23 23,-23 12.7,0 23,10.3 23,23 0,3 -0.6,5.9 -1.7,8.6 -2.3,5.7 -7,10.4 -12.7,12.7 -2.8,1.2 -5.7,1.7 -8.6,1.7 z"
id="path3835"
inkscape:connector-curvature="0"
style="fill:#f9a01b" />
<path
class="st3"
d="m 348.1,167.3 c 11.9,0 21.5,9.6 21.5,21.5 0,2.9 -0.5,5.6 -1.6,8.1 -2.2,5.4 -6.5,9.7 -11.9,11.9 -2.5,1 -5.2,1.5 -8,1.5 -11.9,0 -21.5,-9.6 -21.5,-21.5 0,-11.9 9.6,-21.5 21.5,-21.5 m 0,-3 c -13.5,0 -24.5,11 -24.5,24.5 0,13.5 11,24.5 24.5,24.5 3.2,0 6.2,-0.6 9.1,-1.8 6.1,-2.5 11.1,-7.4 13.6,-13.5 1.2,-2.9 1.8,-6 1.8,-9.2 -0.1,-13.6 -11,-24.5 -24.5,-24.5 z"
id="path3837"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
</g>
<g
id="g3845"
transform="matrix(0.71468453,0,0,0.71588367,-231.27192,-117.61969)">
<path
class="st4"
d="m 413,283.3 c -16.2,0 -29.5,-13.2 -29.5,-29.5 0,-16.2 13.2,-29.5 29.5,-29.5 16.3,0 29.5,13.2 29.5,29.5 0,3.9 -0.7,7.6 -2.2,11.1 -3,7.4 -8.9,13.3 -16.3,16.3 -3.5,1.3 -7.2,2.1 -11,2.1 z"
id="path3841"
inkscape:connector-curvature="0"
style="fill:#e64f25" />
<path
class="st3"
d="m 413,225.3 c 15.7,0 28.5,12.7 28.5,28.5 0,3.8 -0.7,7.4 -2.1,10.7 -2.9,7.2 -8.6,12.9 -15.8,15.7 -3.3,1.3 -6.9,2.1 -10.6,2.1 -15.7,0 -28.5,-12.8 -28.5,-28.5 0,-15.7 12.8,-28.5 28.5,-28.5 m 0,-2 c -16.8,0 -30.5,13.7 -30.5,30.5 0,16.8 13.7,30.5 30.5,30.5 3.9,0 7.8,-0.7 11.4,-2.2 7.6,-3.1 13.8,-9.2 16.9,-16.8 1.5,-3.6 2.2,-7.5 2.2,-11.4 0,-16.9 -13.7,-30.6 -30.5,-30.6 z"
id="path3843"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Calque_1"
x="0px"
y="0px"
viewBox="0 0 128 128"
xml:space="preserve"
sodipodi:docname="logo_re2o_navbar.svg"
width="128"
height="128"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata137"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs135" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1853"
inkscape:window-height="1025"
id="namedview133"
showgrid="false"
inkscape:zoom="1.4177726"
inkscape:cx="267.64168"
inkscape:cy="26.667212"
inkscape:window-x="67"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Calque_1" />
<style
type="text/css"
id="style102">
.st0{fill:#ED2024;}
.st1{stroke:#000000;stroke-miterlimit:10;}
.st2{fill:#F9A01B;}
.st3{fill:#FFFFFF;}
.st4{fill:none;}
.st5{font-family:'RobotoSlab-Regular';}
.st6{font-size:58.0541px;}
.st7{fill:#E64F25;}
</style>
<path
class="st0"
d="M 84.261307,119.98209 H 16.723618 c -4.716918,0 -8.5762143,-3.86577 -8.5762143,-8.5906 V 43.812084 c 2.9302063,1.07382 6.0748183,1.574934 9.3623673,1.574934 2.429927,0 4.859855,-0.286354 7.075377,-0.930654 V 94.85459 c 0,4.72483 3.859296,8.59059 8.576214,8.59059 h 50.242323 c -0.571747,2.21924 -0.857621,4.51007 -0.857621,6.94407 0,3.43624 0.643216,6.58613 1.715243,9.59284 z"
id="path104"
inkscape:connector-curvature="0"
style="fill:#ed2024;stroke-width:0.71528387" />
<path
class="st0"
d="M 119.8526,16.751673 V 84.11633 c -2.93021,-1.07382 -6.07482,-1.57494 -9.36237,-1.57494 -2.42993,0 -4.85986,0.28636 -7.07538,0.93065 V 33.28859 c 0,-4.724832 -3.859294,-8.590604 -8.576212,-8.590604 H 44.524846 c 0.571748,-2.290827 0.92909,-4.653248 0.92909,-7.087252 0,-3.293055 -0.571747,-6.442953 -1.572306,-9.37807 h 67.46622 c 4.64545,-0.07163 8.50475,3.794187 8.50475,8.519009 z"
id="path106"
inkscape:connector-curvature="0"
style="fill:#ed2024;stroke-width:0.71528387" />
<path
class="st1"
d="m 104.55835,96.21477 c -3.8593,1.57494 -6.860974,4.72481 -8.43328,8.59059 L 73.255165,81.8971 45.954216,54.550338 23.084311,31.642052 c 3.859296,-1.574934 6.932439,-4.653238 8.504745,-8.51901 l 24.08487,24.125273 24.871021,24.912765 z"
id="path108"
inkscape:connector-curvature="0"
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.71528387;stroke-miterlimit:10" />
<g
id="g114"
transform="matrix(0.71468453,0,0,0.71588367,-231.27192,-117.61969)">
<path
class="st2"
d="m 478.2,341.5 c -12.7,0 -23,-10.3 -23,-23 0,-2.9 0.5,-5.7 1.6,-8.3 2.2,-5.8 6.8,-10.5 12.6,-12.9 2.8,-1.2 5.8,-1.8 8.8,-1.8 12.7,0 23,10.3 23,23 0,12.7 -10.3,23 -23,23 z"
id="path110"
inkscape:connector-curvature="0"
style="fill:#f9a01b" />
<path
class="st3"
d="m 478.2,297.1 c 11.9,0 21.5,9.6 21.5,21.5 0,11.9 -9.6,21.5 -21.5,21.5 -11.9,0 -21.5,-9.6 -21.5,-21.5 0,-2.8 0.5,-5.4 1.5,-7.8 2.1,-5.4 6.4,-9.8 11.8,-12 2.5,-1.1 5.3,-1.7 8.2,-1.7 m 0,-3 c -3.3,0 -6.5,0.6 -9.4,1.9 -6.1,2.5 -11,7.5 -13.4,13.7 -1.1,2.8 -1.7,5.8 -1.7,8.9 0,13.5 11,24.5 24.5,24.5 13.5,0 24.5,-11 24.5,-24.5 0,-13.5 -11,-24.5 -24.5,-24.5 z"
id="path112"
inkscape:connector-curvature="0"
style="fill:#000000" />
</g>
<g
id="g120"
transform="matrix(0.71468453,0,0,0.71588367,-231.27192,-117.61969)">
<path
class="st2"
d="m 348.1,211.7 c -12.7,0 -23,-10.3 -23,-23 0,-12.7 10.3,-23 23,-23 12.7,0 23,10.3 23,23 0,3 -0.6,5.9 -1.7,8.6 -2.3,5.7 -7,10.4 -12.7,12.7 -2.8,1.2 -5.7,1.7 -8.6,1.7 z"
id="path116"
inkscape:connector-curvature="0"
style="fill:#f9a01b" />
<path
class="st3"
d="m 348.1,167.3 c 11.9,0 21.5,9.6 21.5,21.5 0,2.9 -0.5,5.6 -1.6,8.1 -2.2,5.4 -6.5,9.7 -11.9,11.9 -2.5,1 -5.2,1.5 -8,1.5 -11.9,0 -21.5,-9.6 -21.5,-21.5 0,-11.9 9.6,-21.5 21.5,-21.5 m 0,-3 c -13.5,0 -24.5,11 -24.5,24.5 0,13.5 11,24.5 24.5,24.5 3.2,0 6.2,-0.6 9.1,-1.8 6.1,-2.5 11.1,-7.4 13.6,-13.5 1.2,-2.9 1.8,-6 1.8,-9.2 -0.1,-13.6 -11,-24.5 -24.5,-24.5 z"
id="path118"
inkscape:connector-curvature="0"
style="fill:#000000" />
</g>
<rect
x="263.89999"
y="-117.79999"
class="st4"
width="286.60001"
height="78.5"
id="rect122"
style="fill:none" />
<g
id="g130"
transform="matrix(0.71468453,0,0,0.71588367,-231.27192,-117.61969)">
<path
class="st7"
d="m 413,283.3 c -16.2,0 -29.5,-13.2 -29.5,-29.5 0,-16.2 13.2,-29.5 29.5,-29.5 16.3,0 29.5,13.2 29.5,29.5 0,3.9 -0.7,7.6 -2.2,11.1 -3,7.4 -8.9,13.3 -16.3,16.3 -3.5,1.3 -7.2,2.1 -11,2.1 z"
id="path126"
inkscape:connector-curvature="0"
style="fill:#e64f25" />
<path
class="st3"
d="m 413,225.3 c 15.7,0 28.5,12.7 28.5,28.5 0,3.8 -0.7,7.4 -2.1,10.7 -2.9,7.2 -8.6,12.9 -15.8,15.7 -3.3,1.3 -6.9,2.1 -10.6,2.1 -15.7,0 -28.5,-12.8 -28.5,-28.5 0,-15.7 12.8,-28.5 28.5,-28.5 m 0,-2 c -16.8,0 -30.5,13.7 -30.5,30.5 0,16.8 13.7,30.5 30.5,30.5 3.9,0 7.8,-0.7 11.4,-2.2 7.6,-3.1 13.8,-9.2 16.9,-16.8 1.5,-3.6 2.2,-7.5 2.2,-11.4 0,-16.9 -13.7,-30.6 -30.5,-30.6 z"
id="path128"
inkscape:connector-curvature="0"
style="fill:#000000" />
</g>
</svg>
This diff is collapsed.
......@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-31 14:05+0000\n"
"POT-Creation-Date: 2018-06-23 18:44+0200\n"
"PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Maël Kervella <dev@maelkervella.eu>\n"
"Language-Team: \n"
......@@ -30,6 +30,145 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: base.html:121
#: templates/base.html:59
msgid "Home"
msgstr "Accueil"
#: templates/base.html:83
msgid "My profile"
msgstr "Mon profil"
#: templates/base.html:84
msgid "Log out"
msgstr "Se déconnecter"
#: templates/base.html:90
msgid "Members"
msgstr "Adhérents"
#: templates/base.html:93
msgid "Manage members"
msgstr "Gérer les adhérents"
#: templates/base.html:94
msgid "Manage clubs"
msgstr "Gérer les clubs"
#: templates/base.html:97
msgid "Manage machines"
msgstr "Gérer les machines"
#: templates/base.html:100
msgid "Manage cotisations"
msgstr "Gérer les cotisations"
#: templates/base.html:107
msgid "Topology"
msgstr "Topologie"
#: templates/base.html:109
msgid "Switches"
msgstr "Commutateurs"
#: templates/base.html:110
msgid "Wi-Fi access points"
msgstr "Bornes Wi-Fi"
#: templates/base.html:111
msgid "Rooms"
msgstr "Chambres & locaux"
#: templates/base.html:116
msgid "Statistics"
msgstr "Statistiques"
#: templates/base.html:123
msgid "Preferences"
msgstr "Préférences"
#: templates/base.html:128
msgid "About"
msgstr "A propos"
#: templates/base.html:134
msgid "Sign in"
msgstr "Créer un compte"
#: templates/base.html:140
msgid "Log in"
msgstr "Se connecter"
#: templates/base.html:188
msgid "Username"
msgstr "Pseudo"
#: templates/base.html:192
msgid "Room"
msgstr "Chambre"
#: templates/base.html:196
msgid "Connexion"
msgstr "Connexion"
#: templates/base.html:199 templates/base.html:209
#, python-format
msgid "Until %(date)s"
msgstr "Jusqu'à %(date)s"
#: templates/base.html:201
msgid "Deactivated"
msgstr "Désactivée"
#: templates/base.html:206
msgid "Membership"
msgstr "Adhésion"
#: templates/base.html:211
msgid "Not a member"
msgstr "Non adhérent"
#: templates/base.html:219
msgid "See my profile"
msgstr "Voir mon profil"
#: templates/base.html:223
msgid "You are not logged in"
msgstr "Vous n'êtes pas connecté"
#: templates/base.html:229
#, python-format
msgid "%(nb)s machine active"
msgstr "%(nb)s machine actives"
#: templates/base.html:229
#, python-format
msgid "%(nb)s machines active"
msgstr "%(nb)s machines actives"
#: templates/base.html:238
msgid "See my machines"
msgstr "Voir mes machines"
#: templates/buttons/setlang.html:34
msgid "Translation in development"
msgstr "Traduction en développement"
#: users/widgets.py:35
msgid "Close"
msgstr "Fermer"
#: users/widgets.py:36
msgid "Today"
msgstr "Aujourd'hui"
#: users/widgets.py:44
msgid "Next"
msgstr "Suivant"
#: users/widgets.py:45
msgid "Previous"
msgstr "Précédent"
#: users/widgets.py:46
msgid "Wk"
msgstr "Sem"
......@@ -1005,11 +1005,10 @@ class Club(User):
def user_post_save(**kwargs):
""" Synchronisation post_save : envoie le mail de bienvenue si creation
Synchronise le ldap"""
# is_created = kwargs['created']
is_created = kwargs['created']
user = kwargs['instance']
# TODO : remove if unnecessary
# if is_created:
# user.notif_inscription()
if is_created:
user.notif_inscription()
user.ldap_sync(
base=True,
access_refresh=True,
......
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