diff --git a/app/assets/templates/admin/settings/reservations.html b/app/assets/templates/admin/settings/reservations.html index 9dea81204..4019f47e7 100644 --- a/app/assets/templates/admin/settings/reservations.html +++ b/app/assets/templates/admin/settings/reservations.html @@ -123,11 +123,12 @@
- {{ 'app.admin.settings.confidentiality' }} + {{ 'app.admin.settings.display' }}

{{ 'app.admin.settings.display_machine_reservation_user_name' }}

+

diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 12ce02fb2..0b53e14b3 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -1013,7 +1013,8 @@ en: default_value_is_24_hours: "If the field is leaved empty: 24 hours." visibility_yearly: "maximum visibility for annual subscribers" visibility_others: "maximum visibility for other members" - confidentiality: "Confidentiality" + display: "Display" + display_name_info_html: "When enabled, members and visitors browsing the calendar or booking a machine will see the name of the members who has booked some slots. When disabled, only administrators and managers will view the names.
Warning: if you enable this feature, remember to write it in your privacy policy." display_machine_reservation_user_name: "Display the full name of the user who booked a machine slot" display_name: "Display the name" display_name_enable: "name display" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 13adbc604..408abec0c 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1013,7 +1013,7 @@ es: default_value_is_24_hours: "Si el campo está vacío: 24 horas." visibility_yearly: "máxima visibilidad para suscriptores anuales" visibility_others: "máxima visibilidad para otros miembros" - confidentiality: "Confidencialidad" + display: "Display" display_machine_reservation_user_name: "Mostrar el nombre del usuario que ha reservado una maquina" display_name: "Mostrar el nombre" display_name_enable: "la visualización del nombre" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 05044fafe..64ebcbdef 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1013,7 +1013,8 @@ fr: default_value_is_24_hours: "Si aucune valeur n'est renseignée : 24 heures." visibility_yearly: "la visibilité maximum pour les abonnées annuels" visibility_others: "la visibilité maximum pour les autres membres" - confidentiality: "Confidentialité" + display: "Affichage" + display_name_info_html: "Si cette option est activée, les membres et les visiteurs qui parcourent le calendrier ou qui réservent une machine verront le nom des membres ayant réservé des créneaux. Si désactivée, seuls les administrateurs et les gestionnaires verront les noms.
Attention : si vous activez cette fonctionnalité, pensez à l'indiquer dans votre politique de confidentialité." display_machine_reservation_user_name: "Afficher le nom de l'utilisateur ayant réservé une machine" display_name: "Afficher le nom" display_name_enable: "l'affichage du nom" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 18a1bfc02..01e0486e2 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1013,7 +1013,7 @@ pt: default_value_is_24_hours: "Se o campo estiver vazio: 24 horas." visibility_yearly: "visibilidade máxima para assinantes anuais" visibility_others: "visibilidade máxima para outros membros" - confidentiality: "Confidencialidade" + display: "Display" display_machine_reservation_user_name: "Exibir o nome completo do usuário que reservou um slot de máquina" display_name: "Nome de exibição" display_name_enable: "exibição de nome" diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 13ee8c22e..e706aa1ba 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1013,7 +1013,7 @@ zu: default_value_is_24_hours: "crwdns8395:0crwdne8395:0" visibility_yearly: "crwdns8397:0crwdne8397:0" visibility_others: "crwdns8399:0crwdne8399:0" - confidentiality: "crwdns8401:0crwdne8401:0" + display: "crwdns8401:0crwdne8401:0" display_machine_reservation_user_name: "crwdns8403:0crwdne8403:0" display_name: "crwdns8405:0crwdne8405:0" display_name_enable: "crwdns8407:0crwdne8407:0"