OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Update meetings strings
Mir Bhatia9fe199bbabbe
diff --git a/modules/meeting/app/components/meetings/email_updates_banner_component.rb b/modules/meeting/app/components/meetings/email_updates_banner_component.rbindex c6540453b87..a1bd2ba31df 100644--- a/modules/meeting/app/components/meetings/email_updates_banner_component.rb+++ b/modules/meeting/app/components/meetings/email_updates_banner_component.rb@@ -30,10 +30,11 @@module Meetingsclass EmailUpdatesBannerComponent < ApplicationComponent- def initialize(meeting, override: nil)+ def initialize(meeting, override: nil, type: nil)super@meeting = meeting@override = override+ @type = typeenddef call@@ -43,7 +44,9 @@ module Meetingsprivatedef type- if @meeting.is_a?(RecurringMeeting) || (@meeting.recurring? && @meeting.templated?)+ if @type == :participants+ "participants"+ elsif @meeting.is_a?(RecurringMeeting) || (@meeting.recurring? && @meeting.templated?)"template"elsif @meeting.recurring?"occurrence"diff --git a/modules/meeting/app/components/meetings/participants/manage_participants_dialog.html.erb b/modules/meeting/app/components/meetings/participants/manage_participants_dialog.html.erbindex e6e5387ee7b..186cb9211e8 100644--- a/modules/meeting/app/components/meetings/participants/manage_participants_dialog.html.erb+++ b/modules/meeting/app/components/meetings/participants/manage_participants_dialog.html.erb@@ -19,7 +19,7 @@endcontainer.with_row(mb: 3) do- render(Meetings::EmailUpdatesBannerComponent.new(@meeting))+ render(Meetings::EmailUpdatesBannerComponent.new(@meeting, type: :participants))endcontainer.with_row(mb: 3) dodiff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.ymlindex ffccccd2211..d2fb51094d7 100644--- a/modules/meeting/config/locales/en.yml+++ b/modules/meeting/config/locales/en.yml@@ -342,6 +342,11 @@ en:enable: "Enable email updates"disable: "Disable email updates"banner:+ participants:+ enabled: >+ All participants will receive updated calendar invites via email when you add or remove participants.+ disabled: >+ Email calendar updates are disabled. Participants will not receive an email informing them when you add or remove participants.onetime:enabled: >All participants will receive updated calendar invites via email informing them of your changes.@@ -581,9 +586,9 @@ en:label_meeting_reopen_action: "Reopen meeting"label_meeting_close_action: "Close meeting"label_meeting_in_progress_action: "Start meeting"- text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. Once the agenda is ready, mark it as in progress to document outcomes."+ text_meeting_open_description: "You can add/remove agenda items and participants. Once the agenda is ready, mark it as in progress to document outcomes."text_meeting_closed_description: "This meeting is closed. You cannot add/remove agenda items anymore."- text_meeting_in_progress_description: "This meeting is in progress. You can document outcomes for each agenda item, re-arrange them, and even add new ones. Once the meeting is complete, you can mark it as closed to lock it."+ text_meeting_in_progress_description: "You can modify the agenda, document outcomes for each item and track attendance for participants. Once the meeting is complete, you can mark it as closed to lock it."text_meeting_open_dropdown_description: "Any existing outcomes will remain but users will not be able to add new outcomes."text_meeting_in_progress_dropdown_description: "Document outcomes like information needs or decisions taken during the meeting."text_meeting_closed_dropdown_description: "This meeting is closed. You cannot modify agenda items or outcomes anymore."diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rbindex 8cadc8fc50e..2fc21de5c09 100644--- a/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb+++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb@@ -161,7 +161,7 @@ RSpec.describe "Meetings CRUD",## Close meetingfind_test_selector("close-meeting-button").click- expect(page).to have_text "This meeting is in progress."+ expect(page).to have_text "Once the meeting is complete, you can mark it as closed to lock it."find_test_selector("close-meeting-button").clickexpect(page).to have_text "This meeting is closed."