From 9c6143bd5effb9249a7135ad45012cf840591453 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 29 Aug 2017 17:50:57 +0200 Subject: [PATCH] tooltip about images insertion in medium editor --- CHANGELOG.md | 1 + app/assets/templates/admin/settings/about.html | 1 + config/locales/app.admin.en.yml | 1 + config/locales/app.admin.fr.yml | 1 + config/locales/app.admin.pt.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a544cd87d..ab0c2f91d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Added tooltip concerning images insertion while configuring the about page - Ability for admins to configure the maximum visibility for availabilities reservation - Fix a bug: admins cannot see all availabilities for spaces in reservation calendar when a user is selected - Fix a bug: missing translation after payment in english and portuguese diff --git a/app/assets/templates/admin/settings/about.html b/app/assets/templates/admin/settings/about.html index 09e96e347..c58a5c440 100644 --- a/app/assets/templates/admin/settings/about.html +++ b/app/assets/templates/admin/settings/about.html @@ -17,6 +17,7 @@ }'> + {{ 'settings.drag_and_drop_to_insert_images' | translate }}
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index f32d52ae4..abfae4858 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -568,6 +568,7 @@ en: title_of_the_about_page: "Title of the About page" shift_enter_to_force_carriage_return: "SHIFT + ENTER to force carriage return" input_the_main_content: "Input the main content" + drag_and_drop_to_insert_images: "Drap and drop to insert images" input_the_fablab_contacts: "Input the FabLab contacts" reservations: "Reservations" reservations_parameters: "Reservations parameters" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index aa8daf267..aa9ebc866 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -568,6 +568,7 @@ fr: title_of_the_about_page: "Titre page A propos" shift_enter_to_force_carriage_return: "MAJ. + ENTRÉE pour forcer le retour à la ligne" input_the_main_content: "Saisir le contenu principal" + drag_and_drop_to_insert_images: "Faites un glisser-déposer pour insérer des images" input_the_fablab_contacts: "Saisir les Contacts du FabLab" reservations: "Réservations" reservations_parameters: "Paramètres des réservations" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index a08fa3990..5eebc6d9a 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -568,6 +568,7 @@ pt: title_of_the_about_page: "Título da página sobre" shift_enter_to_force_carriage_return: "SHIFT + ENTER para forçar o retorno" input_the_main_content: "Introduza o conteúdo principal" + drag_and_drop_to_insert_images: "Arrastar e soltar para inserir imagens" input_the_fablab_contacts: "Insira os contatos do FabLab" reservations: "Reservas" reservations_parameters: "Parâmetros das reservas"