Skip to content

Commit 0ac8b2c

Browse files
NeofoxNeofox
committed
cheeeeese
1 parent 2bddf26 commit 0ac8b2c

File tree

6 files changed

+31
-27
lines changed

6 files changed

+31
-27
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@
1616
###> symfony/web-server-bundle ###
1717
/.web-server-pid
1818
###< symfony/web-server-bundle ###
19+
20+
###> react ###
21+
/node_modules/
22+
/public/build/

‎templates/sheet_view/daily-add-meal-modal.html.twig

+7-7
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
$('#selectInput').html(`
7676
<div class="column w-100">
7777
<div class="input-animation">
78-
<label for="entrance">{% trans %}sheet.daily.modal.meal-entrance{% endtrans %}</label>
79-
<select id="entrance" required>
80-
<option value="" hidden>{% trans %}sheet.daily.modal.entrance-option{% endtrans %}</option>
78+
<label for="dish">{% trans %}sheet.daily.modal.meal-dish{% endtrans %}</label>
79+
<select id="dish" required>
80+
<option value="" hidden>{% trans %}sheet.daily.modal.meal-dish-option{% endtrans %}</option>
8181
<option value="nothing">{% trans %}sheet.daily.modal.meal-eat-nothing{% endtrans %}</option>
8282
<option value="half">{% trans %}sheet.daily.modal.meal-eat-half{% endtrans %}</option>
8383
<option value="all">{% trans %}sheet.daily.modal.meal-eat-all{% endtrans %}</option>
@@ -87,9 +87,9 @@
8787
</div>
8888
<div class="column w-100">
8989
<div class="input-animation">
90-
<label for="dish">{% trans %}sheet.daily.modal.meal-dish{% endtrans %}</label>
91-
<select id="dish" required>
92-
<option value="" hidden>{% trans %}sheet.daily.modal.meal-dish-option{% endtrans %}</option>
90+
<label for="cheese">{% trans %}sheet.daily.modal.meal-cheese{% endtrans %}</label>
91+
<select id="cheese" required>
92+
<option value="" hidden>{% trans %}sheet.daily.modal.cheese-option{% endtrans %}</option>
9393
<option value="nothing">{% trans %}sheet.daily.modal.meal-eat-nothing{% endtrans %}</option>
9494
<option value="half">{% trans %}sheet.daily.modal.meal-eat-half{% endtrans %}</option>
9595
<option value="all">{% trans %}sheet.daily.modal.meal-eat-all{% endtrans %}</option>
@@ -145,7 +145,7 @@
145145
data = {...data, ...{details: $('#breadsoup_details').val()}};
146146
break;
147147
case 'menuofday':
148-
data = {...data, ...{entrance: $("option:selected", $('#entrance')).val()}};
148+
data = {...data, ...{cheese: $("option:selected", $('#cheese')).val()}};
149149
data = {...data, ...{dish: $("option:selected", $('#dish')).val()}};
150150
data = {...data, ...{dessert: $("option:selected", $('#dessert')).val()}};
151151
break;

‎templates/sheet_view/daily-summary.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
<strong>{% trans %}sheet.daily.meal.breadsoup{% endtrans %} {% if meal.details is defined %}<span>{{meal.details}}</span></strong>{% endif %} {% trans %}sheet.daily.meal.at{% endtrans %} <strong>{{meal.hour|date('H:i')}}</strong><br>
140140
{% elseif type == 'menuofday' %}
141141
<strong>{% trans %}sheet.daily.meal.menuofday{% endtrans %}</strong> {% trans %}sheet.daily.meal.at{% endtrans %} <strong>{{meal.hour|date('H:i')}}</strong><br>
142-
{% trans %}sheet.daily.meal.menuofday.entrance{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.entrance)|trans() }}</span><br>
143142
{% trans %}sheet.daily.meal.menuofday.dish{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.dish)|trans() }}</span><br>
143+
{% trans %}sheet.daily.meal.menuofday.cheese{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.cheese)|trans() }}</span><br>
144144
{% trans %}sheet.daily.meal.menuofday.dessert{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.dessert)|trans() }}</span><br>
145145
{% endif %}
146146
{% endfor %}

‎templates/sheet_view/daily.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151
<span class="btn-3__title">
152152
{% trans %}sheet.daily.meal.menuofday{% endtrans %}<br>
153153
<span class="title__sub-title">
154-
{% trans %}sheet.daily.meal.menuofday.entrance{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.entrance)|trans() }}</span><br>
155154
{% trans %}sheet.daily.meal.menuofday.dish{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.dish)|trans() }}</span><br>
155+
{% trans %}sheet.daily.meal.menuofday.cheese{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.cheese)|trans() }}</span><br>
156156
{% trans %}sheet.daily.meal.menuofday.dessert{% endtrans %}: <span>{{ ('sheet.daily.modal.meal-eat-' ~ meal.dessert)|trans() }}</span>
157157
</span>
158158
</span>

‎translations/messages.en.xlf

+9-9
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,13 @@
317317
<source>sheet.daily.modal.meal-breadsoup-type-placeholder</source>
318318
<target>Sweet</target>
319319
</trans-unit>
320-
<trans-unit id="TfvCWF6" resname="sheet.daily.modal.meal-entrance">
321-
<source>sheet.daily.modal.meal-entrance</source>
322-
<target>Entrance</target>
320+
<trans-unit id="TfvCWF6" resname="sheet.daily.modal.meal-cheese">
321+
<source>sheet.daily.modal.meal-cheese</source>
322+
<target>Cheese</target>
323323
</trans-unit>
324-
<trans-unit id="1zSPbnw" resname="sheet.daily.modal.entrance-option">
325-
<source>sheet.daily.modal.entrance-option</source>
326-
<target>Select the state of the entrance</target>
324+
<trans-unit id="1zSPbnw" resname="sheet.daily.modal.cheese-option">
325+
<source>sheet.daily.modal.cheese-option</source>
326+
<target>Select the state of the cheese</target>
327327
</trans-unit>
328328
<trans-unit id="jYL1cYY" resname="sheet.daily.modal.meal-eat-nothing">
329329
<source>sheet.daily.modal.meal-eat-nothing</source>
@@ -445,9 +445,9 @@
445445
<source>sheet.daily.meal.menuofday</source>
446446
<target>Menu of the day</target>
447447
</trans-unit>
448-
<trans-unit id="YO7rqty" resname="sheet.daily.meal.menuofday.entrance">
449-
<source>sheet.daily.meal.menuofday.entrance</source>
450-
<target>Entrance</target>
448+
<trans-unit id="YO7rqty" resname="sheet.daily.meal.menuofday.cheese">
449+
<source>sheet.daily.meal.menuofday.cheese</source>
450+
<target>Cheese</target>
451451
</trans-unit>
452452
<trans-unit id="s9fxZCQ" resname="sheet.daily.meal.menuofday.dish">
453453
<source>sheet.daily.meal.menuofday.dish</source>

‎translations/messages.fr.xlf

+9-9
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,13 @@
317317
<source>sheet.daily.modal.meal-breadsoup-type-placeholder</source>
318318
<target>Sucrée</target>
319319
</trans-unit>
320-
<trans-unit id="TfvCWF6" resname="sheet.daily.modal.meal-entrance">
321-
<source>sheet.daily.modal.meal-entrance</source>
322-
<target>Entrée</target>
320+
<trans-unit id="TfvCWF6" resname="sheet.daily.modal.meal-cheese">
321+
<source>sheet.daily.modal.meal-cheese</source>
322+
<target>Fromage</target>
323323
</trans-unit>
324-
<trans-unit id="1zSPbnw" resname="sheet.daily.modal.entrance-option">
325-
<source>sheet.daily.modal.entrance-option</source>
326-
<target>Sélectionnez l'état de l'entrée</target>
324+
<trans-unit id="1zSPbnw" resname="sheet.daily.modal.cheese-option">
325+
<source>sheet.daily.modal.cheese-option</source>
326+
<target>Sélectionnez l'état de lu fromage</target>
327327
</trans-unit>
328328
<trans-unit id="jYL1cYY" resname="sheet.daily.modal.meal-eat-nothing">
329329
<source>sheet.daily.modal.meal-eat-nothing</source>
@@ -445,9 +445,9 @@
445445
<source>sheet.daily.meal.menuofday</source>
446446
<target>Menu du jour</target>
447447
</trans-unit>
448-
<trans-unit id="YO7rqty" resname="sheet.daily.meal.menuofday.entrance">
449-
<source>sheet.daily.meal.menuofday.entrance</source>
450-
<target>Entrée</target>
448+
<trans-unit id="YO7rqty" resname="sheet.daily.meal.menuofday.cheese">
449+
<source>sheet.daily.meal.menuofday.cheese</source>
450+
<target>Fromage</target>
451451
</trans-unit>
452452
<trans-unit id="s9fxZCQ" resname="sheet.daily.meal.menuofday.dish">
453453
<source>sheet.daily.meal.menuofday.dish</source>

0 commit comments

Comments
 (0)