From 6eb297c0f12ec14e8029b54ccb9a6a6b7b202eb1 Mon Sep 17 00:00:00 2001 From: clemcle81500 <117633947+clemcle81500@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:40:54 +0100 Subject: [PATCH] corrections fautes corrections fautes --- templates/avis/index.html.twig | 2 +- templates/avis/show.html.twig | 2 +- templates/home/choice.html.twig | 2 +- templates/home/index.html.twig | 16 ++-------------- templates/home/resa.html.twig | 4 ++-- templates/menu_chef/index.html.twig | 2 +- templates/menu_chef/show.html.twig | 2 +- templates/resa_service/edit.html.twig | 4 ++-- templates/resa_service/index.html.twig | 4 ++-- templates/resa_service/show.html.twig | 6 +++--- templates/resto_admin/edit.html.twig | 4 ++-- templates/resto_admin/index.html.twig | 8 ++++---- templates/resto_admin/new.html.twig | 4 ++-- templates/resto_admin/show.html.twig | 8 ++++---- templates/security/index.html.twig | 2 +- templates/ticket_service/index.html.twig | 2 +- templates/ticket_service/show.html.twig | 2 +- templates/user/index.html.twig | 2 +- templates/user/login.html.twig | 6 +++--- templates/user/signup.html.twig | 2 +- templates/user_admin/index.html.twig | 8 ++++---- templates/user_admin/show.html.twig | 8 ++++---- 22 files changed, 44 insertions(+), 56 deletions(-) diff --git a/templates/avis/index.html.twig b/templates/avis/index.html.twig index ae53ec0..38ad7e7 100644 --- a/templates/avis/index.html.twig +++ b/templates/avis/index.html.twig @@ -10,7 +10,7 @@ Id Note - Com + Commentaire Id_ticket actions diff --git a/templates/avis/show.html.twig b/templates/avis/show.html.twig index 6aacc18..e0613c0 100644 --- a/templates/avis/show.html.twig +++ b/templates/avis/show.html.twig @@ -18,7 +18,7 @@ {{ avi.note }} - Com + Commentaire {{ avi.com }} diff --git a/templates/home/choice.html.twig b/templates/home/choice.html.twig index 621bbc9..a9b7740 100644 --- a/templates/home/choice.html.twig +++ b/templates/home/choice.html.twig @@ -8,7 +8,7 @@

Commande/Resa

{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}
{% if app.user %} -

Vous souhaitez reserver au restaurant : C'est par ici ! +

Vous souhaitez réserver au restaurant : C'est par ici ! {% endif %} {% for menu in menus %} diff --git a/templates/home/index.html.twig b/templates/home/index.html.twig index ab195c6..3c9864d 100644 --- a/templates/home/index.html.twig +++ b/templates/home/index.html.twig @@ -8,23 +8,12 @@ {% if not app.user %}

Bienvenue chez McDoPlus !

-
Tous les menus sont à 25€
- -
Réserver/Commander :
- {% else %}

Salut {{ app.user.email }}

+{% endif %}
Tous les menus sont à 25€
@@ -34,6 +23,5 @@
  • {{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}
    • {% endfor %} -{% endif %} {% endblock %} diff --git a/templates/home/resa.html.twig b/templates/home/resa.html.twig index acd4105..87fa448 100644 --- a/templates/home/resa.html.twig +++ b/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 %}
    -

    Create new Resa

    +

    Créer nouvelle réservation

    {{ include('home/_form.html.twig') }} diff --git a/templates/menu_chef/index.html.twig b/templates/menu_chef/index.html.twig index 909d76a..7fe6d97 100644 --- a/templates/menu_chef/index.html.twig +++ b/templates/menu_chef/index.html.twig @@ -9,7 +9,7 @@ Id - Entre + Entrée Plat Dessert Adresse diff --git a/templates/menu_chef/show.html.twig b/templates/menu_chef/show.html.twig index fa893ba..cc2d29b 100644 --- a/templates/menu_chef/show.html.twig +++ b/templates/menu_chef/show.html.twig @@ -14,7 +14,7 @@ {{ menu.id }} - Entre + Entrée {{ menu.entre }} diff --git a/templates/resa_service/edit.html.twig b/templates/resa_service/edit.html.twig index bfeddb0..c6eef70 100644 --- a/templates/resa_service/edit.html.twig +++ b/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 %}
    -

    Edit Resa

    +

    Edit Réservation

    {{ include('resa_service/_form.html.twig', {'button_label': 'Update'}) }} diff --git a/templates/resa_service/index.html.twig b/templates/resa_service/index.html.twig index 9fee436..ffc2ef7 100644 --- a/templates/resa_service/index.html.twig +++ b/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 %} -

    Resa index

    +

    Réservation index

    Jour suivant : {{ j1|date('Y-m-d') }}

    diff --git a/templates/resa_service/show.html.twig b/templates/resa_service/show.html.twig index 1afb1be..1382615 100644 --- a/templates/resa_service/show.html.twig +++ b/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 %}
    -

    Resa

    +

    Réservation

    @@ -30,7 +30,7 @@ - + diff --git a/templates/resto_admin/edit.html.twig b/templates/resto_admin/edit.html.twig index ff9691e..c188ff8 100644 --- a/templates/resto_admin/edit.html.twig +++ b/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 %}
    -

    Edit Resto

    +

    Edit Restaurant

    {{ include('resto_admin/_form.html.twig', {'button_label': 'Update'}) }} diff --git a/templates/resto_admin/index.html.twig b/templates/resto_admin/index.html.twig index 6f3199f..5cfa185 100644 --- a/templates/resto_admin/index.html.twig +++ b/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 %} -

    Resto index

    +

    Restaurant index

    {{ resa.jour ? resa.jour|date('Y-m-d') : '' }}
    HeurHeure {{ resa.heur ? resa.heur|date('H:i:s') : '' }}
    - + - + diff --git a/templates/resto_admin/new.html.twig b/templates/resto_admin/new.html.twig index 841c3ce..9023691 100644 --- a/templates/resto_admin/new.html.twig +++ b/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 %}
    -

    Create new Resto

    +

    Create new Restaurant

    {{ include('resto_admin/_form.html.twig') }} diff --git a/templates/resto_admin/show.html.twig b/templates/resto_admin/show.html.twig index 06eb95c..938ff2e 100644 --- a/templates/resto_admin/show.html.twig +++ b/templates/resto_admin/show.html.twig @@ -1,10 +1,10 @@ {% extends 'base.html.twig' %} -{% block title %}Resto{% endblock %} +{% block title %}Restaurant{% endblock %} {% block body %}
    -

    Resto

    +

    Restaurant

    IdPayPays VilleAddressAdresse actions
    @@ -14,7 +14,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/templates/security/index.html.twig b/templates/security/index.html.twig index 98019cd..81ba566 100644 --- a/templates/security/index.html.twig +++ b/templates/security/index.html.twig @@ -17,4 +17,4 @@
  • Your template at templates/security/index.html.twig
    • -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/ticket_service/index.html.twig b/templates/ticket_service/index.html.twig index e16b043..7e81401 100644 --- a/templates/ticket_service/index.html.twig +++ b/templates/ticket_service/index.html.twig @@ -11,7 +11,7 @@ - + diff --git a/templates/ticket_service/show.html.twig b/templates/ticket_service/show.html.twig index 8554746..8335f50 100644 --- a/templates/ticket_service/show.html.twig +++ b/templates/ticket_service/show.html.twig @@ -22,7 +22,7 @@ - + diff --git a/templates/user/index.html.twig b/templates/user/index.html.twig index 0c69f6e..df27040 100644 --- a/templates/user/index.html.twig +++ b/templates/user/index.html.twig @@ -1,6 +1,6 @@ {% extends 'base.html.twig' %} -{% block title %}User{% endblock %} +{% block title %}Utilisateur{% endblock %} {% block body %} diff --git a/templates/user/login.html.twig b/templates/user/login.html.twig index e8e622d..b195e2a 100644 --- a/templates/user/login.html.twig +++ b/templates/user/login.html.twig @@ -1,11 +1,11 @@ {% extends 'base.html.twig' %} -{% block title %}User{% endblock %} +{% block title %}Utilisateur{% endblock %} {% block body %}
    -

    Login !

    +

    Connecte-toi !

    @@ -20,4 +20,4 @@
    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/user/signup.html.twig b/templates/user/signup.html.twig index ee3b750..63a3efd 100644 --- a/templates/user/signup.html.twig +++ b/templates/user/signup.html.twig @@ -5,7 +5,7 @@ {% block body %}
    -

    Signup !

    +

    Inscris toi !

    {{ form_start(form) }} diff --git a/templates/user_admin/index.html.twig b/templates/user_admin/index.html.twig index e063844..55fb740 100644 --- a/templates/user_admin/index.html.twig +++ b/templates/user_admin/index.html.twig @@ -9,11 +9,11 @@
    - - + + - - + + diff --git a/templates/user_admin/show.html.twig b/templates/user_admin/show.html.twig index c3c4db6..3fd4236 100644 --- a/templates/user_admin/show.html.twig +++ b/templates/user_admin/show.html.twig @@ -22,19 +22,19 @@ - + - + - + - +
    {{ resto.id }}
    PayPays {{ resto.pay }}
    {{ resto.ville }}
    AddressAdresse {{ resto.address }}
    Id Id_resto Id_usersPayementPaiement Id_menu actions
    {{ ticket.idUsers }}
    PayementPaiement {{ ticket.payement }}
    IdNameFullnameNomPrénom EmailPasswordAddressMot de passeAdresse Grade Id_resto actions{{ user.roles ? user.roles|json_encode : '' }}
    PasswordMot de passe {{ user.password }}
    NameNom {{ user.name }}
    FullnamePrénom {{ user.fullname }}
    AddressAdresse {{ user.address }}