Merge pull request #13737 from opf/epic/meeting-agendas/renaming

Renaming meetings to classic and dynamic
opf · Sep 20, 2023 · 06265b2 · 06265b2
2 parents b031a84 + 44b5ce6
commit 06265b2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/modules/meeting/app/controllers/meetings_controller.rb b/modules/meeting/app/controllers/meetings_controller.rb
@@ -289,7 +289,7 @@ def structured_meeting_params
 
   def meeting_type(given_type)
     case given_type
-    when 'structured'
+    when 'dynamic'
       'StructuredMeeting'
     else
       'Meeting'

diff --git a/modules/meeting/app/views/meetings/_form.html.erb b/modules/meeting/app/views/meetings/_form.html.erb
@@ -59,11 +59,11 @@ See COPYRIGHT and LICENSE files for more details.
           </div>
         </label>
         <label class="op-tile-block--tile form--radio-button-container -wide"
-               for="meeting_type_structured"
+               for="meeting_type_dynamic"
                data-test-selector="op-tile-block">
           <div class="op-tile-block--content">
             <%= styled_radio_button_tag 'meeting[type]',
-                                        'structured',
+                                        'dynamic',
                                         false,
                                         no_label: true,
                                         class: 'radio-button' %>

diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
+      structured_meeting: "Meeting (dynamic)"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -107,9 +108,9 @@ en:
 
   meeting:
     types:
-      classic: 'Free-text meeting'
+      classic: 'Classic'
       classic_text: 'Organize your meeting in a formattable text agenda and protocol.'
-      structured: 'Structured meeting'
+      structured: 'Dynamic'
       structured_text: 'Organize your meeting as a list of agenda items, optionally linking them to a work package.'
     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
@@ -73,7 +73,7 @@
     new_page.visit!
     expect(page).to have_current_path(new_page.path)
     new_page.set_title 'Some title'
-    new_page.set_type 'Structured'
+    new_page.set_type 'Dynamic'
 
     new_page.set_start_date '2013-03-28'
     new_page.set_start_time '13:30'