corrections fautes

corrections fautes

templates/avis/index.html.twig

@@ -10,7 +10,7 @@
             <tr>
                 <th>Id</th>
                 <th>Note</th>
-                <th>Com</th>
+                <th>Commentaire</th>
                 <th>Id_ticket</th>
                 <th>actions</th>
             </tr>

templates/avis/show.html.twig

@@ -18,7 +18,7 @@
                     <td>{{ avi.note }}</td>
                 </tr>
                 <tr>
-                    <th>Com</th>
+                    <th>Commentaire</th>
                     <td>{{ avi.com }}</td>
                 </tr>
                 <tr>

templates/home/choice.html.twig

@@ -8,7 +8,7 @@
     <h1>Commande/Resa</h1>
     <h5>{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</h5>
 {% if  app.user %}
-    <p>Vous souhaitez reserver au restaurant : <code><a href="{{ path('app_home_resa', {'idresto': resto.id}) }}">C'est par ici !</a></code>
+    <p>Vous souhaitez réserver au restaurant : <code><a href="{{ path('app_home_resa', {'idresto': resto.id}) }}">C'est par ici !</a></code>
 {% endif %}
 
     {% for menu in menus %}

templates/home/index.html.twig

@@ -8,23 +8,12 @@
     
 {% if not app.user %}
     <h1>Bienvenue chez McDoPlus !</h1>
-    <h5>Tous les menus sont à <code><span style="font-size: 35px;">25€</span></code></h5>
-    <ul class="center">
-        <li>Entrer</li>
-        <li>Plat</li>
-        <li>Dessert</li>
-    </ul>
-    <h6>Réserver/Commander :</h6>
-    <ul class="center">
-    {% for resto in restos %}
-        <li><code><a href="{{ path('app_home_choice', {'idresto': resto.id}) }}">{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</a></code></li>
-    {% endfor %}
-    </ul>
 {% else %}
     <h1>Salut {{ app.user.email }}</h1>
+{% endif %}
     <h5>Tous les menus sont à <code><span style="font-size: 35px;">25€</span></code></h5>
     <ul class="center">
-        <li>Entrer</li>
+        <li>Entrée</li>
         <li>Plat</li>
         <li>Dessert</li>
     </ul>
@@ -34,6 +23,5 @@
         <li><code><a href="{{ path('app_home_choice', {'idresto': resto.id}) }}">{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</a></code></li>
     {% endfor %}
     </ul>
-{% endif %}
 </div>
 {% endblock %}

templates/home/resa.html.twig

@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}New Resa{% endblock %}
+{% block title %}Réservation{% endblock %}
 
 {% block body %}
 <div class="center">
-    <h1>Create new Resa</h1>
+    <h1>Créer nouvelle réservation</h1>
 
     <article>
         {{ include('home/_form.html.twig') }}

templates/menu_chef/index.html.twig

@@ -9,7 +9,7 @@
         <thead>
             <tr>
                 <th>Id</th>
-                <th>Entre</th>
+                <th>Entrée</th>
                 <th>Plat</th>
                 <th>Dessert</th>
                 <th>Adresse</th>

templates/menu_chef/show.html.twig

@@ -14,7 +14,7 @@
                     <td>{{ menu.id }}</td>
                 </tr>
                 <tr>
-                    <th>Entre</th>
+                    <th>Entrée</th>
                     <td>{{ menu.entre }}</td>
                 </tr>
                 <tr>

templates/resa_service/edit.html.twig

@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Edit Resa{% endblock %}
+{% block title %}Edit Réservation{% endblock %}
 
 {% block body %}
 <div class="center">
-    <h1>Edit Resa</h1>
+    <h1>Edit Réservation</h1>
 
     <article>
         {{ include('resa_service/_form.html.twig', {'button_label': 'Update'}) }}

templates/resa_service/index.html.twig

@@ -1,9 +1,9 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Resa index{% endblock %}
+{% block title %}Réservation index{% endblock %}
 
 {% block body %}
-    <h1>Resa index</h1>
+    <h1>Réservation index</h1>
 
     <p>Jour suivant : <a href="{{ path('app_resa_service_jour', {'datej': j1|date('Y-m-d')}) }}">{{ j1|date('Y-m-d') }}</a></p>
     <table class="table">

templates/resa_service/show.html.twig

@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Resa{% endblock %}
+{% block title %}Réservation{% endblock %}
 
 {% block body %}
 <div class="center">
-    <h1>Resa</h1>
+    <h1>Réservation</h1>
 
     <article>
         <table class="table">
@@ -30,7 +30,7 @@
                     <td>{{ resa.jour ? resa.jour|date('Y-m-d') : '' }}</td>
                 </tr>
                 <tr>
-                    <th>Heur</th>
+                    <th>Heure</th>
                     <td>{{ resa.heur ? resa.heur|date('H:i:s') : '' }}</td>
                 </tr>
             </tbody>

templates/resto_admin/edit.html.twig

@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Edit Resto{% endblock %}
+{% block title %}Edit Restaurant{% endblock %}
 
 {% block body %}
 <div class="center">
-    <h1>Edit Resto</h1>
+    <h1>Edit Restaurant</h1>
 
     <article>
         {{ include('resto_admin/_form.html.twig', {'button_label': 'Update'}) }}

templates/resto_admin/index.html.twig

@@ -1,17 +1,17 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Resto index{% endblock %}
+{% block title %}Restaurant index{% endblock %}
 
 {% block body %}
-    <h1>Resto index</h1>
+    <h1>Restaurant index</h1>
 
     <table class="table">
         <thead>
             <tr>
                 <th>Id</th>
-                <th>Pay</th>
+                <th>Pays</th>
                 <th>Ville</th>
-                <th>Address</th>
+                <th>Adresse</th>
                 <th>actions</th>
             </tr>
         </thead>

templates/resto_admin/new.html.twig

@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}New Resto{% endblock %}
+{% block title %}New Restaurant{% endblock %}
 
 {% block body %}
 <div class="center">
-    <h1>Create new Resto</h1>
+    <h1>Create new Restaurant</h1>
 
     <article>
         {{ include('resto_admin/_form.html.twig') }}

templates/resto_admin/show.html.twig

@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Resto{% endblock %}
+{% block title %}Restaurant{% endblock %}
 
 {% block body %}
 <div class="center">
-    <h1>Resto</h1>
+    <h1>Restaurant</h1>
 
     <article>
         <table class="table">
@@ -14,7 +14,7 @@
                     <td>{{ resto.id }}</td>
                 </tr>
                 <tr>
-                    <th>Pay</th>
+                    <th>Pays</th>
                     <td>{{ resto.pay }}</td>
                 </tr>
                 <tr>
@@ -22,7 +22,7 @@
                     <td>{{ resto.ville }}</td>
                 </tr>
                 <tr>
-                    <th>Address</th>
+                    <th>Adresse</th>
                     <td>{{ resto.address }}</td>
                 </tr>
             </tbody>

templates/ticket_service/index.html.twig

@@ -11,7 +11,7 @@
                 <th>Id</th>
                 <th>Id_resto</th>
                 <th>Id_users</th>
-                <th>Payement</th>
+                <th>Paiement</th>
                 <th>Id_menu</th>
                 <th>actions</th>
             </tr>

templates/ticket_service/show.html.twig

@@ -22,7 +22,7 @@
                     <td>{{ ticket.idUsers }}</td>
                 </tr>
                 <tr>
-                    <th>Payement</th>
+                    <th>Paiement</th>
                     <td>{{ ticket.payement }}</td>
                 </tr>
                 <tr>

templates/user/index.html.twig

@@ -1,6 +1,6 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}User{% endblock %}
+{% block title %}Utilisateur{% endblock %}
 
 {% block body %}
 

templates/user/login.html.twig

@@ -1,11 +1,11 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}User{% endblock %}
+{% block title %}Utilisateur{% endblock %}
 
 {% block body %}
 
 <div class="center">
-    <h1>Login !</h1>
+    <h1>Connecte-toi !</h1>
 
     <article>
         <form action=" {{ path('app_user_login') }}" method="post">

templates/user/signup.html.twig

@@ -5,7 +5,7 @@
 {% block body %}
 
 <div class="center">
-    <h1>Signup !</h1>
+    <h1>Inscris toi !</h1>
 
     <article>
         {{ form_start(form) }}

templates/user_admin/index.html.twig

@@ -9,11 +9,11 @@
         <thead>
             <tr>
                 <th>Id</th>
-                <th>Name</th>
+                <th>Nom</th>
-                <th>Fullname</th>
+                <th>Prénom</th>
                 <th>Email</th>
-                <th>Password</th>
+                <th>Mot de passe</th>
-                <th>Address</th>
+                <th>Adresse</th>
                 <th>Grade</th>
                 <th>Id_resto</th>
                 <th>actions</th>

templates/user_admin/show.html.twig

@@ -22,19 +22,19 @@
                     <td>{{ user.roles ? user.roles|json_encode : '' }}</td>
                 </tr>
                 <tr>
-                    <th>Password</th>
+                    <th>Mot de passe</th>
                     <td>{{ user.password }}</td>
                 </tr>
                 <tr>
-                    <th>Name</th>
+                    <th>Nom</th>
                     <td>{{ user.name }}</td>
                 </tr>
                 <tr>
-                    <th>Fullname</th>
+                    <th>Prénom</th>
                     <td>{{ user.fullname }}</td>
                 </tr>
                 <tr>
-                    <th>Address</th>
+                    <th>Adresse</th>
                     <td>{{ user.address }}</td>
                 </tr>
                 <tr>