diff --git a/app/views/admin/application/featured_image/_edit.html.erb b/app/views/admin/application/featured_image/_edit.html.erb
index 1556607a8fb993739690c336d49c009cbabc2af2..775b159544e391888b7c363e78422fb4a6f629ce 100644
--- a/app/views/admin/application/featured_image/_edit.html.erb
+++ b/app/views/admin/application/featured_image/_edit.html.erb
@@ -3,7 +3,7 @@
as: :single_deletable_file,
direct_upload: true,
label: false,
- hint: '.jpg, .jpeg, .png, .svg',
+ hint: '5 Mo max, .jpg, .jpeg, .png, .svg',
input_html: { accept: '.jpg,.jpeg,.png,.svg' },
preview: true,
resize: true %>
diff --git a/app/views/admin/application/summary/_form.html.erb b/app/views/admin/application/summary/_form.html.erb
index 3fdf29c4744dbdab83e3479023ad2614e2966382..a81bccd8bd649f8f7adc330a905cffb122db651f 100644
--- a/app/views/admin/application/summary/_form.html.erb
+++ b/app/views/admin/application/summary/_form.html.erb
@@ -1,5 +1,6 @@
<%= f.input :summary,
- label: t('admin.summary'),
+ label: t('admin.summary.label'),
+ hint: t('admin.summary.hint'),
input_html: {
value: about.summary&.gsub('&', '&')
} %>
diff --git a/app/views/admin/application/summary/_show.html.erb b/app/views/admin/application/summary/_show.html.erb
index 76a3ba7398e5df3e9d13e081e11e044315a7bb98..260b5ee9fe461a46f0a31e0df40f355fe337f570 100644
--- a/app/views/admin/application/summary/_show.html.erb
+++ b/app/views/admin/application/summary/_show.html.erb
@@ -1,7 +1,7 @@
<%
small ||= false
%>
-<%= osuny_panel t('admin.summary'), small: small do %>
+<%= osuny_panel t('admin.summary.label'), small: small do %>
<% if about.summary.present? %>
<p class="lead"><%= sanitize about.summary %></p>
<% else %>
diff --git a/app/views/admin/communication/blocks/components/image/_edit.html.erb b/app/views/admin/communication/blocks/components/image/_edit.html.erb
index 8a2421cc0d0d6ef4bb0e4a90ac143a5ea9cb75bc..d82dbabc839cf120ec588aefc234633657f58566 100644
--- a/app/views/admin/communication/blocks/components/image/_edit.html.erb
+++ b/app/views/admin/communication/blocks/components/image/_edit.html.erb
@@ -1,6 +1,7 @@
<%
-label = t 'admin.communication.blocks.components.image.input.label'
-remove = t 'admin.communication.blocks.components.image.input.remove'
+label = t('admin.communication.blocks.components.image.input.label')
+remove = t('admin.communication.blocks.components.image.input.remove')
+hint = t('admin.communication.blocks.components.image.input.hint')
%>
<div class="mb-3">
<div v-if="!<%= model %>.<%= property %>.id">
@@ -25,4 +26,7 @@ remove = t 'admin.communication.blocks.components.image.input.remove'
<i class="<%= Icon::DELETE %>"></i>
<%= remove %>
</a>
+ <div v-if="!<%= model %>.<%= property %>.id" class="form-text">
+ <%= hint %>
+ </div>
</div>
diff --git a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
index 6d0613533f3ed7283b7648ba7e3ea2a9aa07fc8e..50965764ce66360dbeabee572b4bfabea4f3bfaa 100644
--- a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
@@ -6,18 +6,18 @@
<%= block_component_edit block, :layout %>
-<p>Envoyer plusieurs images</p>
+<p><%= t('.send_multiple_images') %></p>
-<input class="form-control"
- type="file"
- accept="image/*"
- @change="onMultipleFileImageChange( $event, 'image' )"
- data-size-limit="<%= Communication::Block::IMAGE_MAX_SIZE %>"
- multiple>
+<input class="form-control mb-2"
+ type="file"
+ accept="image/*"
+ @change="onMultipleFileImageChange( $event, 'image' )"
+ data-size-limit="<%= Communication::Block::IMAGE_MAX_SIZE %>"
+ multiple>
<hr class="my-5">
-<p>Déplacer les images ci-dessous pour les mettre dans l'ordre souhaité</p>
+<p><%= t('.move_images') %></p>
<draggable :list="data.elements" class="row pure__row--small">
<div v-for="(element, index) in data.elements" class="col-xxl-1 col-lg-2 col-4">
<div class="card">
@@ -33,7 +33,7 @@
<hr class="my-5">
-<p>Envoyer les images et saisir les textes ci-dessous</p>
+<p><%= t('.send_and_edit_images') %></p>
<div v-for="(element, index) in data.elements" class="mb-5">
<%= osuny_panel 'Image' do %>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index 53d7b5157d2a2120082a6d5a2df5f31cafca3a94..51b3bda961fa49a051f7601554c4dd059b8226b3 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -249,8 +249,9 @@ en:
remove: Remove file
image:
input:
- label: Image (.png, .jpg, .svg)
+ label: Image
remove: Remove image
+ hint: 5 MB max, .png, .jpg, .svg
alt:
label: Alternative text
placeholder: Enter alternative text
@@ -396,8 +397,9 @@ en:
remove_element: Remove feature
element:
image:
- label: Image (.png, .jpg, .svg)
+ label: Image
remove: Remove image
+ hint: 5 MB max, .png, .jpg, .svg
alt:
label: Alternative text
placeholder: Enter text description
@@ -433,6 +435,7 @@ en:
label: Carousel
description: Images are big, with a previous / next navigation and a constant height.
edit:
+ add_image: Add an image
description:
label: Description
element:
@@ -445,8 +448,10 @@ en:
credit:
label: Credit
placeholder: Enter image's credit here
- add_image: Add image
+ move_images: Move images below to define the order
remove_image: Remove image
+ send_and_edit_images: Send the images and enter the text below
+ send_multiple_images: Send multiple images
image:
description: An image with its alternative description, a credit and a text.
edit:
@@ -844,5 +849,6 @@ en:
breadcrumb_title: If the field is empty, page title will be used in breadcrumbs.
full_width: On large screens, a full width page uses all available space for the content. This is good for landing pages, or to make them spectacular. If the page is not full width, the content column will be smaller to make reading easier. The unused space might be used for a table of contents.
text: This field is deprecated, content will not be displayed on the website.
+ header_text: By default, this text replaces the title. On some sites, it is displayed in addition.
communication_website_post:
text: This field is deprecated, content will not be displayed on the website.
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index a38a79a3dc2a5fa1751949fa57a2f0c893f3c0e5..9fd44afcb0068ff6c68e3e106eaa9a75046d428e 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -182,7 +182,7 @@ fr:
featured_image: Image à la une
featured_image_alt: Texte alternatif
full_width: Pleine largeur
- header_text: Titre affiché dans le header
+ header_text: Titre affiché en haut de page
parent: Page parente
path: Chemin
published: Publié ?
@@ -249,8 +249,9 @@ fr:
remove: Enlever le fichier
image:
input:
- label: Image (.png, .jpg, .svg)
+ label: Image
remove: Enlever l'image
+ hint: 5 Mo max, .png, .jpg, .svg
alt:
label: Texte alternatif
placeholder: Entrer la description textuelle
@@ -393,8 +394,9 @@ fr:
remove_element: Supprimer la fonctionnalité
element:
image:
- label: Image (.png, .jpg, .svg)
+ label: Image
remove: Enlever l'image
+ hint: 5 Mo max, .png, .jpg, .svg
alt:
label: Texte alternatif
placeholder: Entrer la description textuelle
@@ -430,6 +432,7 @@ fr:
label: Carrousel
description: Les images sont présentées en grand, toutes de la même hauteur.
edit:
+ add_image: Ajouter une image
description:
label: Description
element:
@@ -442,8 +445,10 @@ fr:
credit:
label: Crédit
placeholder: Entrer le crédit de l'image ici
- add_image: Ajouter une image
+ move_images: Déplacer les images ci-dessous pour les mettre dans l'ordre souhaité
remove_image: Enlever l'image
+ send_and_edit_images: Envoyer les images et saisir les textes ci-dessous
+ send_multiple_images: Envoyer plusieurs images
image:
description: Une image avec sa description alternative accessible, son texte et son crédit.
edit:
@@ -841,5 +846,6 @@ fr:
breadcrumb_title: Si ce champ est vide le titre de la page sera utilisé dans le fil d'Ariane.
full_width: Sur de grands écrans, la page en pleine largeur utilisera tout l'espace disponible, ce qui est pertinent pour événementialiser une page. Si la page n'est pas en pleine largeur, l'espace dédié au contenu sera réduit pour faciliter la lecture, et l'espace libre pourra être utilisé pour une table des matières facilitant la navigation.
text: Ce champ est déprécié, le contenu ne s'affichera pas sur le site.
+ header_text: Par défaut, ce texte remplace le titre. Dans certains sites, il s'affiche en plus.
communication_website_post:
text: Ce champ est déprécié, le contenu ne s'affichera pas sur le site.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a5eb4f89bc7eb1d0c59d4f601314ef7a2ab26f0e..df0d2e1554c5f0c31fe83fef230cfaccd6b453ce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -128,7 +128,7 @@ en:
sentence_html: Value inherited from %{link}
status: Inherited value
meta_description:
- hint: Plain text without HTML, dedicated to SEO
+ hint: Plain text without HTML, dedicated to Search Engine Optimization (SEO).
label: Meta description
pending_tasks:
label: Background tasks pending
@@ -141,7 +141,9 @@ en:
successfully_quit_html: "<i>%{model}</i> successfully quit <i>%{target}</i>."
successfully_removed_html: "<i>%{model}</i> was successfully removed."
successfully_updated_html: "<i>%{model}</i> was successfully updated."
- summary: Summary
+ summary:
+ label: Summary
+ hint: A short text, like a heading for an article. Don't write all the content here, there are blocks for that.
users_alerts:
already_confirmed: "Your account has already been confirmed."
not_locked_html: '<i>%{model}</i> was not locked.'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5557ca5e1f8dd3e937c7f42fcb09a3172731a7cc..b46a688831e8b05a28a17855ea1ca27bcbb26218 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -128,7 +128,7 @@ fr:
sentence_html: Valeur héritée de %{link}
status: Valeur héritée
meta_description:
- hint: Texte simple, dédié au SEO
+ hint: Texte simple, dédié au à l'optimisation pour les moteurs de recherche (Search Engine Optimization, SEO).
label: Meta description
pending_tasks:
label: Tâches en cours de traitement
@@ -141,7 +141,9 @@ fr:
successfully_quit_html: "<i>%{model}</i> a bien quitté <i>%{target}</i>."
successfully_removed_html: "<i>%{model}</i> a bien été retiré(e)."
successfully_updated_html: "<i>%{model}</i> a bien été mis(e) à jour."
- summary: Résumé
+ summary:
+ label: Résumé
+ hint: Un texte court, comme un chapô pour un article. Ne mettez pas tout le contenu ici, pour ça, il y a les blocs !
users_alerts:
already_confirmed: "Votre compte est déjà confirmé."
not_locked_html: "<i>%{model}</i> n'était pas verrouillé(e)."