diff --git a/app/models/communication/website/menu/item.rb b/app/models/communication/website/menu/item.rb index 538a99285e5e1ba463d59a5338329837766f78a8..cebd923e57d6badfa782af773751af683d597c9c 100644 --- a/app/models/communication/website/menu/item.rb +++ b/app/models/communication/website/menu/item.rb @@ -44,7 +44,17 @@ class Communication::Website::Menu::Item < ApplicationRecord foreign_key: :parent_id, dependent: :destroy - enum kind: { blank: 0, url: 10, page: 20, programs: 30, program: 31, news: 40, news_category: 41, news_article: 42, staff: 50 }, _prefix: :kind + enum kind: { + blank: 0, + url: 10, + page: 20, + programs: 30, + program: 31, + news: 40, + news_category: 41, + news_article: 42, + staff: 50 + }, _prefix: :kind validates :title, presence: true validates :about, presence: true, if: :has_about? @@ -58,7 +68,7 @@ class Communication::Website::Menu::Item < ApplicationRecord end def static_target - target = + target = '' case self.kind when 'url' target = url @@ -75,7 +85,7 @@ class Communication::Website::Menu::Item < ApplicationRecord else target = about&.path end - target.end_with? "/" ? target + target.end_with?('/') ? target : "#{target}/" end diff --git a/app/views/admin/communication/website/menu/items/_form.html.erb b/app/views/admin/communication/website/menu/items/_form.html.erb index 97329593860078584a8ecea4830150806ce0a05d..e69a398400fd64f60bc6d7ea1654e2d46042a344 100644 --- a/app/views/admin/communication/website/menu/items/_form.html.erb +++ b/app/views/admin/communication/website/menu/items/_form.html.erb @@ -10,7 +10,6 @@ <%= f.input :title %> <%= f.input :kind, include_blank: false, - label_method: -> (p) { I18n.t(p[1], scope: 'enums.communication/website/menu/item.kind') }, input_html: { class: 'js-kind-input', data: { url: kind_switch_admin_communication_website_menu_items_path } diff --git a/app/views/admin/communication/website/menu/items/show.html.erb b/app/views/admin/communication/website/menu/items/show.html.erb index 312dd7bb5f58e865d54b5e10c7aa8377583ab9e8..c532a3e1fe9d305442af4809bb4f3daddd642f60 100644 --- a/app/views/admin/communication/website/menu/items/show.html.erb +++ b/app/views/admin/communication/website/menu/items/show.html.erb @@ -22,7 +22,7 @@ </div> <div class="card-body"> <h3 class="h5"><%= Communication::Website::Menu::Item.human_attribute_name('kind') %></h3> - <p><%= I18n.t(@item.kind, scope: 'enums.communication/website/menu/item.kind') %></p> + <p><%= @item.kind_i18n %></p> <% if @item.kind_url? %> <h3 class="h5"><%= Communication::Website::Menu::Item.human_attribute_name('url') %></h3> <p><%= link_to @item.url, @item.url, target: '_blank' unless @item.url.blank? %></p> diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml index 8928fa86f7138b08940d67df090c6944715e19c6..7c289b1bd6d6fb0c0b189f7e533e0374dccd8365 100644 --- a/config/locales/communication/en.yml +++ b/config/locales/communication/en.yml @@ -129,14 +129,17 @@ en: new_curation: New curation see_all: See the full list (%{number} elements) enums: - communication/website/menu/item: - kind: - blank: Title - news: News index - news_article: Specific news - news_category: News category - page: Specific Page - program: Specific program - programs: Programs index - staff: Staff - url: URL + communication: + website: + menu: + item: + kind: + blank: Title + news: News index + news_article: Specific news + news_category: News category + page: Specific Page + program: Specific program + programs: Programs index + staff: Staff + url: URL diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml index 57be17030f4598641d9f3d7e086104f893e18fb8..ce57688d06a53a053550a84bc4b4cefa85c085f9 100644 --- a/config/locales/communication/fr.yml +++ b/config/locales/communication/fr.yml @@ -119,14 +119,17 @@ fr: new_curation: Nouvelle curation see_all: Voir la liste complète (%{number} éléments) enums: - communication/website/menu/item: - kind: - blank: Titre intermédiaire - news: Index des actualités - news_article: Actualité spécifique - news_category: Catégorie d'actualités - page: Page spécifique - program: Formation spécifique - programs: Index des formations - staff: Équipe - url: URL + communication: + website: + menu: + item: + kind: + blank: Titre intermédiaire + news: Index des actualités + news_article: Actualité spécifique + news_category: Catégorie d'actualités + page: Page spécifique + program: Formation spécifique + programs: Index des formations + staff: Équipe + url: URL