Skip to content

Commit 7d62dba

Browse files
DestinyyyyDestinyyyy
authored
chore: contrib input field error wording and layout fixes (#2438)
1 parent 57c1f6f commit 7d62dba

File tree

5 files changed

+36
-23
lines changed

5 files changed

+36
-23
lines changed

‎locale/en/LC_MESSAGES/django.mo‎

-8.09 KB
Binary file not shown.

‎locale/en/LC_MESSAGES/django.po‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: PACKAGE VERSION\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2026-01-21 15:06+0100\n"
10-
"PO-Revision-Date: 2026-01-21 10:39+0100\n"
9+
"POT-Creation-Date: 2026-01-22 10:45+0100\n"
10+
"PO-Revision-Date: 2026-01-22 10:45+0100\n"
1111
"Last-Translator: <patrick.nguyen@beta.gouv.fr>\n"
1212
"Language-Team: LANGUAGE <LL@li.org>\n"
1313
"Language: \n"
@@ -3898,17 +3898,20 @@ msgstr "Street number"
38983898
msgid "Voie *"
38993899
msgstr "Street *"
39003900

3901-
msgid "Voie obligatoire"
3902-
msgstr "Mandatory route"
3901+
msgid "Veuillez remplir ce champ si le champ lieu-dit est vide"
3902+
msgstr "Please complete this field if the location field is empty"
39033903

39043904
msgid "Code postal *"
39053905
msgstr "Postal code *"
39063906

39073907
msgid "Code postal obligatoire"
39083908
msgstr "Postal code required"
39093909

3910-
msgid "Lieu dit obligatoire"
3911-
msgstr "Mandatory place name"
3910+
msgid "Lieu dit *"
3911+
msgstr "Place called *"
3912+
3913+
msgid "Veuillez remplir ce champ si le champ voie est vide"
3914+
msgstr "Please complete this field if the channel field is empty"
39123915

39133916
msgid "Commune *"
39143917
msgstr "Municipality *"

‎locale/fr/LC_MESSAGES/django.po‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2026-01-21 15:06+0100\n"
10+
"POT-Creation-Date: 2026-01-22 10:45+0100\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3619,7 +3619,7 @@ msgstr ""
36193619
msgid "Voie *"
36203620
msgstr ""
36213621

3622-
msgid "Voie obligatoire"
3622+
msgid "Veuillez remplir ce champ si le champ lieu-dit est vide"
36233623
msgstr ""
36243624

36253625
msgid "Code postal *"
@@ -3628,7 +3628,10 @@ msgstr ""
36283628
msgid "Code postal obligatoire"
36293629
msgstr ""
36303630

3631-
msgid "Lieu dit obligatoire"
3631+
msgid "Lieu dit *"
3632+
msgstr ""
3633+
3634+
msgid "Veuillez remplir ce champ si le champ voie est vide"
36323635
msgstr ""
36333636

36343637
msgid "Commune *"

‎static/scss/_utilities.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@
179179
&--center {
180180
align-items: center;
181181
}
182+
&--end {
183+
align-items: end;
184+
}
182185
}
183186
}
184187

‎templates/contrib/1-admin-infos.html‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ <h3 class="fr-mb-0">{% translate "Nom et adresse de l'établissement" %}</h3>
114114
</legend>
115115
<p class="fr-px-3w">{% translate "Champs obligatoires *" %}</p>
116116
<div class="fr-fieldset__content">
117-
<div class="fr-grid-row fr-px-2w fr-pb-1w fr-mb-2w">
118-
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w fr-input-group {% if form.errors.nom %}fr-input-group--error{% endif %} display--flex direction--column align-self--baseline justify-content--end fr-mb-2w fr-mb-md-0">
117+
<div class="fr-grid-row fr-px-2w fr-pb-1w fr-mb-2w {% if form.errors.activite %}align-items--center{% else %}align-items--end{% endif %}">
118+
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w fr-input-group {% if form.errors.nom %}fr-input-group--error{% endif %} display--flex direction--column align-self--baseline justify-content--end {% if form.errors.activite %}fr-mb-2w{% else %}fr-mb-2 fr-mb-md-0{% endif %}">
119119
<label class="fr-label" for="id_nom">{% translate "Nom *" %}</label>
120120
{{ form.nom }}
121121
{% if form.errors.nom %}
@@ -139,32 +139,36 @@ <h3 class="fr-mb-0">{% translate "Nom et adresse de l'établissement" %}</h3>
139139
</div>
140140
</div>
141141
</div>
142-
<div class="fr-grid-row fr-px-2w fr-pb-1w">
143-
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w fr-mb-3w">
142+
<div class="fr-grid-row fr-px-2w fr-pb-1w fr-mb-2w {% if form.errors.voie %}align-items--center{% else %}align-items--end{% endif %}">
143+
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w {% if form.errors.voie %}fr-mb-2w{% else %}fr-mb-2 fr-mb-md-0{% endif %}">
144144
<label class="fr-label" for="id_numero">{% translate "Numéro de la voie" %}</label>
145145
{{ form.numero }}
146146
</div>
147-
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-input-group fr-mb-3w {% if form.errors.voie %}fr-input-group--error{% endif %}">
148-
<label class="fr-label" for="id_voie">{% translate "Voie *" %}</label>
147+
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-input-group {% if form.errors.voie %}fr-input-group--error{% endif %}">
148+
<label class="fr-label" for="id_voie">
149+
{% translate "Voie *" %}
150+
<span class="fr-hint-text">{% translate "Veuillez remplir ce champ si le champ lieu-dit est vide" %}</span>
151+
</label>
149152
{{ form.voie }}
150-
{% if form.errors.voie %}
151-
<p class="fr-error-text" id="voie-error-message">{% translate "Voie obligatoire" %}</p>
152-
{% endif %}
153+
{% if form.errors.voie %}<p class="fr-error-text" id="voie-error-message">{{ form.errors.voie.0 }}</p>{% endif %}
153154
</div>
154155
</div>
155-
<div class="fr-grid-row fr-px-2w">
156-
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-pr-md-4w fr-mb-3w {% if form.errors.code_postal %}fr-input-group--error fr-mb-0{% endif %}">
156+
<div class="fr-grid-row fr-px-2w fr-mb-2w fr-mb-2w {% if form.errors.lieu_dit %}align-items--center{% else %}align-items--end{% endif %}">
157+
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-pr-md-4w {% if form.errors.code_postal %}fr-input-group--error{% endif %} {% if form.errors.lieu_dit %}fr-mb-2w{% else %}fr-mb-2 fr-mb-md-0{% endif %}">
157158
<label class="fr-label" for="id_code_postal">{% translate "Code postal *" %}</label>
158159
{{ form.code_postal }}
159160
{% if form.errors.code_postal %}
160161
<p class="fr-error-text" id="code-postal-error-message">{% translate "Code postal obligatoire" %}</p>
161162
{% endif %}
162163
</div>
163-
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-input-group fr-mb-3w {% if form.errors.lieu_dit %}fr-input-group--error{% endif %}">
164-
<label class="fr-label" for="id_lieu_dit">{% translate "Lieu dit" %}</label>
164+
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-input-group {% if form.errors.lieu_dit %}fr-input-group--error{% endif %}">
165+
<label class="fr-label" for="id_lieu_dit">
166+
{% translate "Lieu dit *" %}
167+
<span class="fr-hint-text">{% translate "Veuillez remplir ce champ si le champ voie est vide" %}</span>
168+
</label>
165169
{{ form.lieu_dit }}
166170
{% if form.errors.lieu_dit %}
167-
<p class="fr-error-text" id="lieu-dit-error-message">{% translate "Lieu dit obligatoire" %}</p>
171+
<p class="fr-error-text" id="lieu-dit-error-message">{{ form.errors.lieu_dit.0 }}</p>
168172
{% endif %}
169173
</div>
170174
</div>

0 commit comments

Comments
 (0)