DEV: merge discourse post event settings to calendar

Before, site settings were divided into `discourse calendar` and `discourse events`. This PR is merging them. Also, translation were moved under `discourse_calendar` key.
discourse · Dec 4, 2023 · e02293d · e02293d
1 parent d27e52e
commit e02293d
Show file tree

Hide file tree

Showing 36 changed files with 415 additions and 172 deletions.
diff --git a/app/controllers/discourse_post_event/events_controller.rb b/app/controllers/discourse_post_event/events_controller.rb
@@ -68,14 +68,18 @@ def csv_bulk_invite
           else
             render json:
                      failed_json.merge(
-                       errors: [I18n.t("discourse_post_event.errors.bulk_invite.error")],
+                       errors: [
+                         I18n.t("discourse_calendar.discourse_post_event.errors.bulk_invite.error"),
+                       ],
                      ),
                    status: 422
           end
         rescue StandardError
           render json:
                    failed_json.merge(
-                     errors: [I18n.t("discourse_post_event.errors.bulk_invite.error")],
+                     errors: [
+                       I18n.t("discourse_calendar.discourse_post_event.errors.bulk_invite.error"),
+                     ],
                    ),
                  status: 422
         end
@@ -101,7 +105,9 @@ def bulk_invite
       rescue StandardError
         render json:
                  failed_json.merge(
-                   errors: [I18n.t("discourse_post_event.errors.bulk_invite.error")],
+                   errors: [
+                     I18n.t("discourse_calendar.discourse_post_event.errors.bulk_invite.error"),
+                   ],
                  ),
                status: 422
       end

diff --git a/app/models/discourse_post_event/event.rb b/app/models/discourse_post_event/event.rb
@@ -128,7 +128,10 @@ def raw_invitees_length
       if self.raw_invitees && self.raw_invitees.length > 10
         errors.add(
           :base,
-          I18n.t("discourse_post_event.errors.models.event.raw_invitees_length", count: 10),
+          I18n.t(
+            "discourse_calendar.discourse_post_event.errors.models.event.raw_invitees_length",
+            count: 10,
+          ),
         )
       end
     end
@@ -138,7 +141,9 @@ def raw_invitees_are_groups
       if self.raw_invitees && User.select(:id).where(username: self.raw_invitees).limit(1).count > 0
         errors.add(
           :base,
-          I18n.t("discourse_post_event.errors.models.event.raw_invitees.only_group"),
+          I18n.t(
+            "discourse_calendar.discourse_post_event.errors.models.event.raw_invitees.only_group",
+          ),
         )
       end
     end
@@ -149,7 +154,9 @@ def ends_before_start
            self.original_starts_at >= self.original_ends_at
         errors.add(
           :base,
-          I18n.t("discourse_post_event.errors.models.event.ends_at_before_starts_at"),
+          I18n.t(
+            "discourse_calendar.discourse_post_event.errors.models.event.ends_at_before_starts_at",
+          ),
         )
       end
     end
@@ -161,7 +168,10 @@ def allowed_custom_fields
         if !allowed_custom_fields.include?(key)
           errors.add(
             :base,
-            I18n.t("discourse_post_event.errors.models.event.custom_field_is_invalid", field: key),
+            I18n.t(
+              "discourse_calendar.discourse_post_event.errors.models.event.custom_field_is_invalid",
+              field: key,
+            ),
           )
         end
       end
@@ -199,9 +209,9 @@ def create_notification!(user, post, predefined_attendance: false)
 
       message =
         if predefined_attendance
-          "discourse_post_event.notifications.invite_user_predefined_attendance_notification"
+          "discourse_calendar.discourse_post_event.notifications.invite_user_predefined_attendance_notification"
         else
-          "discourse_post_event.notifications.invite_user_notification"
+          "discourse_calendar.discourse_post_event.notifications.invite_user_notification"
         end
 
       attrs = {

diff --git a/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.hbs b/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.hbs
@@ -1,4 +1,4 @@
 <DButton
-  @label="discourse_post_event.bulk_invite_modal.download_sample_csv"
+  @label="discourse_calendar.discourse_post_event.bulk_invite_modal.download_sample_csv"
   @action={{action "downloadSampleCsv"}}
 />
diff --git a/assets/javascripts/discourse/components/event-date.gjs b/assets/javascripts/discourse/components/event-date.gjs
@@ -92,9 +92,12 @@ export default class EventDate extends Component {
   }
 
   get timeRemainingContent() {
-    return I18n.t("discourse_post_event.topic_title.ends_in_duration", {
-      duration: this.eventEndedAt.from(moment()),
-    });
+    return I18n.t(
+      "discourse_calendar.discourse_post_event.topic_title.ends_in_duration",
+      {
+        duration: this.eventEndedAt.from(moment()),
+      }
+    );
   }
 
   _parsedDate(date) {

diff --git a/assets/javascripts/discourse/components/modal/post-event-builder.hbs b/assets/javascripts/discourse/components/modal/post-event-builder.hbs
@@ -1,7 +1,7 @@
 <DModal
   @title={{i18n
     (concat
-      "discourse_post_event.builder_modal."
+      "discourse_calendar.discourse_post_event.builder_modal."
       (if @model.event.isNew "create_event_title" "update_event_title")
     )
   }}
@@ -23,41 +23,43 @@
 
         <EventField
           @class="name"
-          @label="discourse_post_event.builder_modal.name.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.name.label"
         >
           <Input
             @value={{@model.event.name}}
             placeholder={{i18n
-              "discourse_post_event.builder_modal.name.placeholder"
+              "discourse_calendar.discourse_post_event.builder_modal.name.placeholder"
             }}
           />
         </EventField>
 
         <EventField
           @class="url"
-          @label="discourse_post_event.builder_modal.url.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.url.label"
         >
           <Input
             @value={{@model.event.url}}
             placeholder={{i18n
-              "discourse_post_event.builder_modal.url.placeholder"
+              "discourse_calendar.discourse_post_event.builder_modal.url.placeholder"
             }}
           />
         </EventField>
 
         <EventField
           @class="timezone"
-          @label="discourse_post_event.builder_modal.timezone.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.timezone.label"
         >
           <TimezoneInput
             @value={{@model.event.timezone}}
             @onChange={{this.setNewTimezone}}
             @class="input-xxlarge"
-            @none="discourse_post_event.builder_modal.timezone.remove_timezone"
+            @none="discourse_calendar.discourse_post_event.builder_modal.timezone.remove_timezone"
           />
         </EventField>
 
-        <EventField @label="discourse_post_event.builder_modal.status.label">
+        <EventField
+          @label="discourse_calendar.discourse_post_event.builder_modal.status.label"
+        >
           <label class="radio-label">
             <RadioButton
               @name="status"
@@ -67,11 +69,13 @@
             />
             <span class="message">
               <span class="title">
-                {{i18n "discourse_post_event.models.event.status.public.title"}}
+                {{i18n
+                  "discourse_calendar.discourse_post_event.models.event.status.public.title"
+                }}
               </span>
               <span class="description">
                 {{i18n
-                  "discourse_post_event.models.event.status.public.description"
+                  "discourse_calendar.discourse_post_event.models.event.status.public.description"
                 }}
               </span>
             </span>
@@ -86,12 +90,12 @@
             <span class="message">
               <span class="title">
                 {{i18n
-                  "discourse_post_event.models.event.status.private.title"
+                  "discourse_calendar.discourse_post_event.models.event.status.private.title"
                 }}
               </span>
               <span class="description">
                 {{i18n
-                  "discourse_post_event.models.event.status.private.description"
+                  "discourse_calendar.discourse_post_event.models.event.status.private.description"
                 }}
               </span>
             </span>
@@ -106,12 +110,12 @@
             <span class="message">
               <span class="title">
                 {{i18n
-                  "discourse_post_event.models.event.status.standalone.title"
+                  "discourse_calendar.discourse_post_event.models.event.status.standalone.title"
                 }}
               </span>
               <span class="description">
                 {{i18n
-                  "discourse_post_event.models.event.status.standalone.description"
+                  "discourse_calendar.discourse_post_event.models.event.status.standalone.description"
                 }}
               </span>
             </span>
@@ -120,7 +124,7 @@
 
         <EventField
           @enabled={{eq @model.event.status "private"}}
-          @label="discourse_post_event.builder_modal.invitees.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.invitees.label"
         >
           <GroupSelector
             @fullWidthWrap={{true}}
@@ -133,7 +137,7 @@
 
         <EventField
           @class="reminders"
-          @label="discourse_post_event.builder_modal.reminders.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.reminders.label"
         >
           <div class="reminders-list">
             {{#each @model.event.reminders as |reminder|}}
@@ -151,7 +155,7 @@
                   min={{0}}
                   @value={{reminder.value}}
                   placeholder={{i18n
-                    "discourse_post_event.builder_modal.name.placeholder"
+                    "discourse_calendar.discourse_post_event.builder_modal.name.placeholder"
                   }}
                 />
 
@@ -185,46 +189,46 @@
             class="add-reminder"
             @disabled={{this.addReminderDisabled}}
             @icon="plus"
-            @label="discourse_post_event.builder_modal.add_reminder"
+            @label="discourse_calendar.discourse_post_event.builder_modal.add_reminder"
             @action={{@model.addReminder}}
           />
         </EventField>
 
         <EventField
           @class="recurrence"
-          @label="discourse_post_event.builder_modal.recurrence.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.recurrence.label"
         >
           <ComboBox
             @class="available-recurrences"
             @value={{@model.event.recurrence}}
             @content={{this.availableRecurrences}}
             @options={{hash
-              none="discourse_post_event.builder_modal.recurrence.none"
+              none="discourse_calendar.discourse_post_event.builder_modal.recurrence.none"
             }}
           />
         </EventField>
 
         <EventField
           @class="minimal-event"
-          @label="discourse_post_event.builder_modal.minimal.label"
+          @label="discourse_calendar.discourse_post_event.builder_modal.minimal.label"
         >
           <label class="checkbox-label">
             <Input @type="checkbox" @checked={{@model.event.minimal}} />
             <span class="message">
               {{i18n
-                "discourse_post_event.builder_modal.minimal.checkbox_label"
+                "discourse_calendar.discourse_post_event.builder_modal.minimal.checkbox_label"
               }}
             </span>
           </label>
         </EventField>
 
         {{#if this.allowedCustomFields.length}}
           <EventField
-            @label="discourse_post_event.builder_modal.custom_fields.label"
+            @label="discourse_calendar.discourse_post_event.builder_modal.custom_fields.label"
           >
             <p class="event-field-description">
               {{i18n
-                "discourse_post_event.builder_modal.custom_fields.description"
+                "discourse_calendar.discourse_post_event.builder_modal.custom_fields.description"
               }}
             </p>
             {{#each this.allowedCustomFields as |allowedCustomField|}}
@@ -237,7 +241,7 @@
                   (get @model.event.custom_fields allowedCustomField)
                 }}
                 placeholder={{i18n
-                  "discourse_post_event.builder_modal.custom_fields.placeholder"
+                  "discourse_calendar.discourse_post_event.builder_modal.custom_fields.placeholder"
                 }}
                 {{on "input" (fn this.setCustomField allowedCustomField)}}
               />
@@ -252,15 +256,15 @@
       <DButton
         @type="button"
         class="btn-primary"
-        @label="discourse_post_event.builder_modal.create"
+        @label="discourse_calendar.discourse_post_event.builder_modal.create"
         @icon="calendar-day"
         @action={{this.createEvent}}
       />
     {{else}}
       <DButton
         @type="button"
         class="btn-primary"
-        @label="discourse_post_event.builder_modal.update"
+        @label="discourse_calendar.discourse_post_event.builder_modal.update"
         @icon="calendar-day"
         @action={{this.updateEvent}}
       />