Use the correct date formatter in the subtitle

opf · Nov 28, 2024 · d5aa2b9 · d5aa2b9
1 parent e3f20c7
commit d5aa2b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 deletions.
diff --git a/modules/meeting/app/components/recurring_meetings/table_component.rb b/modules/meeting/app/components/recurring_meetings/table_component.rb
@@ -32,14 +32,6 @@ module RecurringMeetings
   class TableComponent < ::OpPrimer::BorderBoxTableComponent
     columns :start_time, :relative_time, :last_edited, :status, :create
 
-    # def sortable?
-    #   true
-    # end
-    #
-    # def initial_sort
-    #   %i[start_time asc]
-    # end
-
     def has_actions?
       true
     end

diff --git a/modules/meeting/app/models/recurring_meeting.rb b/modules/meeting/app/models/recurring_meeting.rb
@@ -70,23 +70,24 @@ def schedule
 
   def schedule_in_words # rubocop:disable Metrics/AbcSize
     base = case frequency
-    when "daily"
-      interval == 1 ? human_frequency : I18n.t("recurring_meeting.in_words.daily_interval", interval: interval.ordinalize)
-    when "working_days"
-      if interval == 1
-        I18n.t("recurring_meeting.in_words.working_days")
-      else
-        I18n.t("recurring_meeting.in_words.working_days_interval", interval: interval.ordinalize)
-      end
-    when "weekly"
-      if interval == 1
-        I18n.t("recurring_meeting.in_words.weekly", weekday:)
-      else
-        I18n.t("recurring_meeting.in_words.weekly_interval", interval: interval.ordinalize, weekday:)
-      end
-    end
-
-    I18n.t("recurring_meeting.in_words.full", base:, time: format_time(start_time, include_date: false), end_date:)
+           when "daily"
+             interval == 1 ? human_frequency : I18n.t("recurring_meeting.in_words.daily_interval", interval: interval.ordinalize)
+           when "working_days"
+             if interval == 1
+               I18n.t("recurring_meeting.in_words.working_days")
+             else
+               I18n.t("recurring_meeting.in_words.working_days_interval", interval: interval.ordinalize)
+             end
+           when "weekly"
+             if interval == 1
+               I18n.t("recurring_meeting.in_words.weekly", weekday:)
+             else
+               I18n.t("recurring_meeting.in_words.weekly_interval", interval: interval.ordinalize, weekday:)
+             end
+           end
+
+    I18n.t("recurring_meeting.in_words.full", base:, time: format_time(start_time, include_date: false),
+                                              end_date: format_date(end_date))
   end
 
   def scheduled_occurrences(limit:)