From d1449f7b0f89f14b53c69cade56827a18a656bdd Mon Sep 17 00:00:00 2001
From: nanoy <me@nanoy.fr>
Date: Sun, 23 Dec 2018 21:57:02 +0100
Subject: [PATCH] Corrections mineures

---
 gestion/templates/gestion/manage.html |  4 ++--
 templates/footer.html                 |  4 ++--
 templates/nav.html                    |  2 +-
 users/templates/users/profile.html    | 22 +++++++++++-----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gestion/templates/gestion/manage.html b/gestion/templates/gestion/manage.html
index dc01dba..ad9bec2 100644
--- a/gestion/templates/gestion/manage.html
+++ b/gestion/templates/gestion/manage.html
@@ -133,7 +133,7 @@
 								{% if not panini|divisibleby:4 %}
 								</tr>
 								{% endif %}
-								<tr style="text-align:center; font-weight:bold;"><td colspan="4">Softs</td></tr>
+								<tr style="text-align:center; font-weight:bold;"><td colspan="4">Boissons sans alcool</td></tr>
 								{% for product in soft %}
 								{% if forloop.counter0|divisibleby:4 %}
 								<tr style="text-align:center">
@@ -147,7 +147,7 @@
 								</tr>
 								{% endif %}
 
-								<tr style="text-align:center; font-weight:bold;"><td colspan="4">Bouffe</td></tr>
+								<tr style="text-align:center; font-weight:bold;"><td colspan="4">En-cas</td></tr>
 								{% for product in food %}
 								{% if forloop.counter0|divisibleby:4 %}
 								<tr style="text-align:center">
diff --git a/templates/footer.html b/templates/footer.html
index 3fa8d98..305130d 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,7 +1,7 @@
 {% load vip %}
 <section>
-	<h2>A propos</h2>
-	<p>L'association Coopé Technopole Metz est une association de droit local dont le siège social est établi à la résidence Edouard Branly. Son but est d'entretenir un lieu convivial sous la forme d'un bar associatif. Les membres actifs sont les coopemen (ou coopewomen).</p>
+	<h2>À propos</h2>
+	<p>L'association Coopé Technopôle Metz (CTM) est une association de droit local dont le siège social est établi à la résidence Edouard Branly. Son but est d'entretenir un lieu convivial sous la forme d'un bar associatif. Les membres actifs sont les coopemen (ou coopewomen).</p>
 </section>
 <section>
 	<h2>Contacts</h2>
diff --git a/templates/nav.html b/templates/nav.html
index ca603be..eb8ffed 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -4,7 +4,7 @@
 </span>
 {% if perms.gestion.add_consumptionhistory or perms.gestion.add_refund or perms.gestion.add_reload %}
 <span class="tabulation2">
-	<a href="{% url 'gestion:manage' %}">Caisse</a>
+	<a href="{% url 'gestion:manage' %}">Transactions</a>
 </span>
 {% endif %}
 {% if perms.auth.add_user or perms.auth.view_user or perms.auth.add_group or perms.auth.view_group or perms.users.add_school or perms.users.view_school %}
diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html
index be3c9c8..e4ceb35 100644
--- a/users/templates/users/profile.html
+++ b/users/templates/users/profile.html
@@ -25,19 +25,19 @@
 				<ul class="alt" id="informationsClient">
 					<li>
 						<b>Nom : </b>{{user.last_name}}<span class="tabulation">
-							<b>Prénom : </b>{{user.first_name}}</span><span class="tabulation">
+						<b>Prénom : </b>{{user.first_name}}</span><span class="tabulation">
 						<b>École : </b>{{user.profile.school}}</span>
 					</li>
-					<li><b>Pseudo : </b>{{user.username}}<span class="tabulation">
-						<b>Mail: </b> {{user.email}}</span>
+					<li><b>Nom d'utilisateur : </b>{{user.username}}<span class="tabulation">
+						<b>Adresse mail: </b> {{user.email}}</span>
 					</li>
 					<li>
 						<b>Date inscription : </b>{{user.date_joined}}<span class="tabulation">
 						<b>Fin de cotisation: </b> {{user.profile.cotisationEnd|default:"Aucune cotisation"}}</span>
 					</li>
-					<li><b>Solde : </b>{{user.profile.balance}}<span class="tabulation">
-						<b>Crédit : </b>{{user.profile.credit}}</span><span class="tabulation">
-						<b>Débit : </b>{{user.profile.debit}}</span>
+					<li><b>Solde : </b>{{user.profile.balance}} €<span class="tabulation">
+						<b>Crédit : </b>{{user.profile.credit}} €</span><span class="tabulation">
+						<b>Débit : </b>{{user.profile.debit}} €</span>
 					</li>
 					<li><b>Groupe(s) : </b>{{user.groups.all|join:", "}}</li>
 					<li>
@@ -151,7 +151,7 @@
 					<tr>
 						<td>{{c.product}}</td>
 						<td>{{c.quantity}}</td>
-						<td>{{c.amount}}</td>
+						<td>{{c.amount}} €</td>
 						<td>{{c.paymentMethod}}</td>
 						<td>{{c.date}}</td>
 						<td>{% if perms.gestion.delete_consumptionhistory %}<a href="{% url 'gestion:cancelConsumption' c.pk %}" class="button small">Annuler</a>{% endif %}</td>
@@ -185,7 +185,7 @@
 					<tr>
 						<td>{{m.menu}}</td>
 						<td>{{m.quantity}}</td>
-						<td>{{m.amount}}</td>
+						<td>{{m.amount}} €</td>
 						<td>{{m.paymentMethod}}</td>
 						<td>{{m.date}}</td>
 						<td>{% if perms.gestion.delete_menuhistory %}<a href="{% url 'gestion:cancelMenu' m.pk %}" class="button small">Annuler</a>{% endif %}</td>
@@ -214,7 +214,7 @@
 				<tbody>
 					{% for reload in reloads %}
 					<tr>
-						<td>{{reload.amount}}€</td>
+						<td>{{reload.amount}} €</td>
 						<td>{{reload.PaymentMethod}}</td>
 						<td>{{reload.date}}</td>
 					</tr>
@@ -240,14 +240,14 @@
 						<th>Date de paiement</th>
 						<th>Moyen de paiement</th>
 						<th>Date de fin</th>
-						<th>Etat</th>
+						<th>État</th>
 						<th>Modération</th>
 					</tr>
 				</thead>
 				<tbody>
 					{% for cotisation in cotisations %}
 					<tr>
-						<td>{{cotisation.amount}}€</td>
+						<td>{{cotisation.amount}} €</td>
 						<td>{{cotisation.duration}} jours</td>
 						<td>{{cotisation.paymentDate}}</td>
 						<td>{{cotisation.paymentMethod}}</td>