From f6ea8027316529c9a991be7c773b4eeb2e8e2ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 18 Nov 2024 17:17:53 +0100 Subject: [PATCH] Remove one-off meeting label --- .../app/components/meetings/index/dialog_component.rb | 2 +- .../meetings/index_sub_header_component.html.erb | 10 +++++----- modules/meeting/config/locales/en.yml | 4 ++-- .../structured_meeting_crud_spec.rb | 2 +- modules/meeting/spec/support/pages/meetings/index.rb | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/meeting/app/components/meetings/index/dialog_component.rb b/modules/meeting/app/components/meetings/index/dialog_component.rb index 1b8edb028109..ad90c65469d1 100644 --- a/modules/meeting/app/components/meetings/index/dialog_component.rb +++ b/modules/meeting/app/components/meetings/index/dialog_component.rb @@ -52,7 +52,7 @@ def render? end def title - @type == :new ? I18n.t("label_meeting_new_one_time") : "Copy meeting" + @type == :new ? I18n.t("label_meeting_new_dynamic") : "Copy meeting" end end end diff --git a/modules/meeting/app/components/meetings/index_sub_header_component.html.erb b/modules/meeting/app/components/meetings/index_sub_header_component.html.erb index 30d5ea1f23e3..dc6622c3c428 100644 --- a/modules/meeting/app/components/meetings/index_sub_header_component.html.erb +++ b/modules/meeting/app/components/meetings/index_sub_header_component.html.erb @@ -23,16 +23,16 @@ I18n.t(:label_meeting) end - menu.with_item(label: I18n.t("meeting.types.classic"), - tag: :a, - href: dynamic_path - ) - menu.with_item(label: I18n.t("meeting.types.structured"), tag: :a, href: new_dialog_meetings_path(project_id: @project&.id), content_arguments: { data: { controller: "async-dialog" }} ) + + menu.with_item(label: I18n.t("meeting.types.classic"), + tag: :a, + href: dynamic_path + ) end end end diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml index 797124c433fb..c5c7f6beee96 100644 --- a/modules/meeting/config/locales/en.yml +++ b/modules/meeting/config/locales/en.yml @@ -104,7 +104,7 @@ en: label_meeting: "Meeting" label_meeting_plural: "Meetings" label_meeting_new: "New Meeting" - label_meeting_new_one_time: "New one-time meeting" + label_meeting_new_dynamic: "New dynamic meeting" label_meeting_create: "Create meeting" label_meeting_copy: "Copy meeting" label_meeting_edit: "Edit Meeting" @@ -164,7 +164,7 @@ en: types: classic: "Classic" classic_text: "Organize your meeting in a formattable text agenda and protocol." - structured: "One-time" + structured: "Dynamic" structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb index 523df5737559..fb52588d6d33 100644 --- a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb @@ -72,7 +72,7 @@ meetings_page.visit! expect(page).to have_current_path(meetings_page.path) # rubocop:disable RSpec/ExpectInHook meetings_page.click_on "add-meeting-button" - meetings_page.click_on "One-time" + meetings_page.click_on "Dynamic" meetings_page.set_title "Some title" meetings_page.set_start_date "2013-03-28" diff --git a/modules/meeting/spec/support/pages/meetings/index.rb b/modules/meeting/spec/support/pages/meetings/index.rb index f60665f6dc4f..e8633c583891 100644 --- a/modules/meeting/spec/support/pages/meetings/index.rb +++ b/modules/meeting/spec/support/pages/meetings/index.rb @@ -100,7 +100,7 @@ def expect_create_new_types click_on("add-meeting-button") expect(page).to have_link("Classic") - expect(page).to have_link("One-time") + expect(page).to have_link("Dynamic") end def expect_copy_action(meeting)