discourse
/
discourse-calendar
mirror of https://github.com/discourse/discourse-calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Bump dependencies and fix linting (#685)

This commit is contained in:
David Taylor 2025-02-06 16:43:59 +00:00 committed by GitHub
parent 6cd250dc10
commit db040749b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 848 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse/components/csv-uploader.gjs
View File

@ -3,9 +3,9 @@ import { getOwner } from "@ember/owner";
import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import { service } from "@ember/service"; import { service } from "@ember/service";
import { or } from "truth-helpers"; import { or } from "truth-helpers";
import icon from "discourse/helpers/d-icon";
import UppyUpload from "discourse/lib/uppy/uppy-upload"; import UppyUpload from "discourse/lib/uppy/uppy-upload";
import icon from "discourse-common/helpers/d-icon"; import { i18n } from "discourse-i18n";
import i18n from "discourse-common/helpers/i18n";
export default class CsvUploader extends Component { export default class CsvUploader extends Component {
@service dialog; @service dialog;

2
assets/javascripts/discourse/components/discourse-post-event/creator.gjs
View File

@ -1,7 +1,7 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import avatar from "discourse/helpers/avatar"; import avatar from "discourse/helpers/avatar";
import { formatUsername } from "discourse/lib/utilities"; import { formatUsername } from "discourse/lib/utilities";
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
export default class DiscoursePostEventCreator extends Component { export default class DiscoursePostEventCreator extends Component {
get username() { get username() {

2
assets/javascripts/discourse/components/discourse-post-event/dates.gjs
View File

@ -5,9 +5,9 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import { next } from "@ember/runloop"; import { next } from "@ember/runloop";
import { service } from "@ember/service"; import { service } from "@ember/service";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import icon from "discourse/helpers/d-icon";
import { applyLocalDates } from "discourse/lib/local-dates"; import { applyLocalDates } from "discourse/lib/local-dates";
import { cook } from "discourse/lib/text"; import { cook } from "discourse/lib/text";
import icon from "discourse-common/helpers/d-icon";
import guessDateFormat from "../../lib/guess-best-date-format"; import guessDateFormat from "../../lib/guess-best-date-format";
export default class DiscoursePostEventDates extends Component { export default class DiscoursePostEventDates extends Component {

2
assets/javascripts/discourse/components/discourse-post-event/event-status.gjs
View File

@ -1,5 +1,5 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
export default class EventStatus extends Component { export default class EventStatus extends Component {
get eventStatusLabel() { get eventStatusLabel() {

2
assets/javascripts/discourse/components/discourse-post-event/index.gjs
View File

@ -4,9 +4,9 @@ import { service } from "@ember/service";
import { modifier } from "ember-modifier"; import { modifier } from "ember-modifier";
import PluginOutlet from "discourse/components/plugin-outlet"; import PluginOutlet from "discourse/components/plugin-outlet";
import concatClass from "discourse/helpers/concat-class"; import concatClass from "discourse/helpers/concat-class";
import icon from "discourse/helpers/d-icon";
import replaceEmoji from "discourse/helpers/replace-emoji"; import replaceEmoji from "discourse/helpers/replace-emoji";
import routeAction from "discourse/helpers/route-action"; import routeAction from "discourse/helpers/route-action";
import icon from "discourse-common/helpers/d-icon";
import Creator from "./creator"; import Creator from "./creator";
import Dates from "./dates"; import Dates from "./dates";
import EventStatus from "./event-status"; import EventStatus from "./event-status";

2
assets/javascripts/discourse/components/discourse-post-event/invitee.gjs
View File

@ -5,7 +5,7 @@ import { eq } from "truth-helpers";
import AvatarFlair from "discourse/components/avatar-flair"; import AvatarFlair from "discourse/components/avatar-flair";
import avatar from "discourse/helpers/avatar"; import avatar from "discourse/helpers/avatar";
import concatClass from "discourse/helpers/concat-class"; import concatClass from "discourse/helpers/concat-class";
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
export default class DiscoursePostEventInvitee extends Component { export default class DiscoursePostEventInvitee extends Component {
@service site; @service site;

4
assets/javascripts/discourse/components/discourse-post-event/invitees.gjs
View File

@ -1,7 +1,7 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import { service } from "@ember/service"; import { service } from "@ember/service";
import icon from "discourse-common/helpers/d-icon"; import icon from "discourse/helpers/d-icon";
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
import Invitee from "./invitee"; import Invitee from "./invitee";
export default class DiscoursePostEventInvitees extends Component { export default class DiscoursePostEventInvitees extends Component {

4
assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs
View File

@ -7,9 +7,9 @@ import DropdownMenu from "discourse/components/dropdown-menu";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { downloadCalendar } from "discourse/lib/download-calendar"; import { downloadCalendar } from "discourse/lib/download-calendar";
import { exportEntity } from "discourse/lib/export-csv"; import { exportEntity } from "discourse/lib/export-csv";
import { getAbsoluteURL } from "discourse/lib/get-url";
import { cook } from "discourse/lib/text"; import { cook } from "discourse/lib/text";
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
import { getAbsoluteURL } from "discourse-common/lib/get-url";
import DMenu from "float-kit/components/d-menu"; import DMenu from "float-kit/components/d-menu";
import { buildParams, replaceRaw } from "../../lib/raw-event-helper"; import { buildParams, replaceRaw } from "../../lib/raw-event-helper";
import PostEventBuilder from "../modal/post-event-builder"; import PostEventBuilder from "../modal/post-event-builder";

2
assets/javascripts/discourse/components/discourse-post-event/url.gjs
View File

@ -1,5 +1,5 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import icon from "discourse-common/helpers/d-icon"; import icon from "discourse/helpers/d-icon";
export default class DiscoursePostEventUrl extends Component { export default class DiscoursePostEventUrl extends Component {
get url() { get url() {

4
assets/javascripts/discourse/components/event-date.gjs
View File

@ -1,6 +1,6 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import { service } from "@ember/service"; import { service } from "@ember/service";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
import guessDateFormat from "../lib/guess-best-date-format"; import guessDateFormat from "../lib/guess-best-date-format";
export default class EventDate extends Component { export default class EventDate extends Component {
@ -93,7 +93,7 @@ export default class EventDate extends Component {
} }
get timeRemainingContent() { get timeRemainingContent() {
return I18n.t("discourse_post_event.topic_title.ends_in_duration", { return i18n("discourse_post_event.topic_title.ends_in_duration", {
duration: this.eventEndedAt.from(moment()), duration: this.eventEndedAt.from(moment()),
}); });
} }

2
assets/javascripts/discourse/components/event-field.gjs
View File

@ -1,4 +1,4 @@
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
import notEq from "truth-helpers/helpers/not-eq"; import notEq from "truth-helpers/helpers/not-eq";
const EventField = <template> const EventField = <template>

40
assets/javascripts/discourse/components/modal/post-event-builder.js
View File

@ -5,7 +5,7 @@ import { service } from "@ember/service";
import { extractError } from "discourse/lib/ajax-error"; import { extractError } from "discourse/lib/ajax-error";
import { cook } from "discourse/lib/text"; import { cook } from "discourse/lib/text";
import Group from "discourse/models/group"; import Group from "discourse/models/group";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
import { buildParams, replaceRaw } from "../../lib/raw-event-helper"; import { buildParams, replaceRaw } from "../../lib/raw-event-helper";
export default class PostEventBuilder extends Component { export default class PostEventBuilder extends Component {
@ -33,13 +33,13 @@ export default class PostEventBuilder extends Component {
return [ return [
{ {
value: "notification", value: "notification",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.reminders.types.notification" "discourse_post_event.builder_modal.reminders.types.notification"
), ),
}, },
{ {
value: "bumpTopic", value: "bumpTopic",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.reminders.types.bump_topic" "discourse_post_event.builder_modal.reminders.types.bump_topic"
), ),
}, },
@ -50,25 +50,21 @@ export default class PostEventBuilder extends Component {
return [ return [
{ {
value: "minutes", value: "minutes",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.reminders.units.minutes" "discourse_post_event.builder_modal.reminders.units.minutes"
), ),
}, },
{ {
value: "hours", value: "hours",
name: I18n.t( name: i18n("discourse_post_event.builder_modal.reminders.units.hours"),
"discourse_post_event.builder_modal.reminders.units.hours"
),
}, },
{ {
value: "days", value: "days",
name: I18n.t("discourse_post_event.builder_modal.reminders.units.days"), name: i18n("discourse_post_event.builder_modal.reminders.units.days"),
}, },
{ {
value: "weeks", value: "weeks",
name: I18n.t( name: i18n("discourse_post_event.builder_modal.reminders.units.weeks"),
"discourse_post_event.builder_modal.reminders.units.weeks"
),
}, },
]; ];
} }
@ -77,13 +73,13 @@ export default class PostEventBuilder extends Component {
return [ return [
{ {
value: "before", value: "before",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.reminders.periods.before" "discourse_post_event.builder_modal.reminders.periods.before"
), ),
}, },
{ {
value: "after", value: "after",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.reminders.periods.after" "discourse_post_event.builder_modal.reminders.periods.after"
), ),
}, },
@ -94,35 +90,31 @@ export default class PostEventBuilder extends Component {
return [ return [
{ {
id: "every_day", id: "every_day",
name: I18n.t("discourse_post_event.builder_modal.recurrence.every_day"), name: i18n("discourse_post_event.builder_modal.recurrence.every_day"),
}, },
{ {
id: "every_month", id: "every_month",
name: I18n.t( name: i18n("discourse_post_event.builder_modal.recurrence.every_month"),
"discourse_post_event.builder_modal.recurrence.every_month"
),
}, },
{ {
id: "every_weekday", id: "every_weekday",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.recurrence.every_weekday" "discourse_post_event.builder_modal.recurrence.every_weekday"
), ),
}, },
{ {
id: "every_week", id: "every_week",
name: I18n.t( name: i18n("discourse_post_event.builder_modal.recurrence.every_week"),
"discourse_post_event.builder_modal.recurrence.every_week"
),
}, },
{ {
id: "every_two_weeks", id: "every_two_weeks",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.recurrence.every_two_weeks" "discourse_post_event.builder_modal.recurrence.every_two_weeks"
), ),
}, },
{ {
id: "every_four_weeks", id: "every_four_weeks",
name: I18n.t( name: i18n(
"discourse_post_event.builder_modal.recurrence.every_four_weeks" "discourse_post_event.builder_modal.recurrence.every_four_weeks"
), ),
}, },
@ -256,7 +248,7 @@ export default class PostEventBuilder extends Component {
if (newRaw) { if (newRaw) {
const props = { const props = {
raw: newRaw, raw: newRaw,
edit_reason: I18n.t("discourse_post_event.edit_reason"), edit_reason: i18n("discourse_post_event.edit_reason"),
}; };
const cooked = await cook(newRaw); const cooked = await cook(newRaw);

12
assets/javascripts/discourse/components/modal/post-event-bulk-invite.js
View File

@ -7,7 +7,7 @@ import { TrackedArray } from "@ember-compat/tracked-built-ins";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { extractError } from "discourse/lib/ajax-error"; import { extractError } from "discourse/lib/ajax-error";
import Group from "discourse/models/group"; import Group from "discourse/models/group";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
export default class PostEventBulkInvite extends Component { export default class PostEventBulkInvite extends Component {
@service dialog; @service dialog;
@ -22,19 +22,19 @@ export default class PostEventBulkInvite extends Component {
get bulkInviteStatuses() { get bulkInviteStatuses() {
return [ return [
{ {
label: I18n.t("discourse_post_event.models.invitee.status.unknown"), label: i18n("discourse_post_event.models.invitee.status.unknown"),
name: "unknown", name: "unknown",
}, },
{ {
label: I18n.t("discourse_post_event.models.invitee.status.going"), label: i18n("discourse_post_event.models.invitee.status.going"),
name: "going", name: "going",
}, },
{ {
label: I18n.t("discourse_post_event.models.invitee.status.not_going"), label: i18n("discourse_post_event.models.invitee.status.not_going"),
name: "not_going", name: "not_going",
}, },
{ {
label: I18n.t("discourse_post_event.models.invitee.status.interested"), label: i18n("discourse_post_event.models.invitee.status.interested"),
name: "interested", name: "interested",
}, },
]; ];
@ -97,7 +97,7 @@ export default class PostEventBulkInvite extends Component {
@action @action
async uploadDone() { async uploadDone() {
await this.dialog.alert( await this.dialog.alert(
I18n.t("discourse_post_event.bulk_invite_modal.success") i18n("discourse_post_event.bulk_invite_modal.success")
); );
this.args.closeModal(); this.args.closeModal();
} }

7
assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs
View File

@ -9,9 +9,8 @@ import ConditionalLoadingSpinner from "discourse/components/conditional-loading-
import DButton from "discourse/components/d-button"; import DButton from "discourse/components/d-button";
import DModal from "discourse/components/d-modal"; import DModal from "discourse/components/d-modal";
import concatClass from "discourse/helpers/concat-class"; import concatClass from "discourse/helpers/concat-class";
import i18n from "discourse-common/helpers/i18n"; import { debounce } from "discourse/lib/decorators";
import { debounce } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n";
import I18n from "discourse-i18n";
import ToggleInvitees from "../../toggle-invitees"; import ToggleInvitees from "../../toggle-invitees";
import User from "./user"; import User from "./user";
@ -38,7 +37,7 @@ export default class PostEventInviteesModal extends Component {
} }
get title() { get title() {
return I18n.t( return i18n(
`discourse_post_event.invitees_modal.${ `discourse_post_event.invitees_modal.${
this.args.model.title || "title_invited" this.args.model.title || "title_invited"
}` }`

6
assets/javascripts/discourse/components/region-input.js
View File

@ -1,6 +1,6 @@
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { classNames } from "@ember-decorators/component"; import { classNames } from "@ember-decorators/component";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
import ComboBoxComponent from "select-kit/components/combo-box"; import ComboBoxComponent from "select-kit/components/combo-box";
import { import {
pluginApiIdentifiers, pluginApiIdentifiers,
@ -28,14 +28,14 @@ export default class RegionInput extends ComboBoxComponent {
if (this.allowNoneRegion === true) { if (this.allowNoneRegion === true) {
regions.push({ regions.push({
name: I18n.t("discourse_calendar.region.none"), name: i18n("discourse_calendar.region.none"),
id: null, id: null,
}); });
} }
regions = regions.concat( regions = regions.concat(
HOLIDAY_REGIONS.map((region) => ({ HOLIDAY_REGIONS.map((region) => ({
name: I18n.t(`discourse_calendar.region.names.${region}`), name: i18n(`discourse_calendar.region.names.${region}`),
id: region, id: region,
})).sort((a, b) => a.name.localeCompare(b.name)) })).sort((a, b) => a.name.localeCompare(b.name))
); );

2
assets/javascripts/discourse/components/upcoming-events-calendar.js
View File

@ -2,9 +2,9 @@ import Component from "@ember/component";
import { schedule } from "@ember/runloop"; import { schedule } from "@ember/runloop";
import { tagName } from "@ember-decorators/component"; import { tagName } from "@ember-decorators/component";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import getURL from "discourse/lib/get-url";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import getURL from "discourse-common/lib/get-url";
import { formatEventName } from "../helpers/format-event-name"; import { formatEventName } from "../helpers/format-event-name";
import addRecurrentEvents from "../lib/add-recurrent-events"; import addRecurrentEvents from "../lib/add-recurrent-events";
import fullCalendarDefaultOptions from "../lib/full-calendar-default-options"; import fullCalendarDefaultOptions from "../lib/full-calendar-default-options";

14
assets/javascripts/discourse/components/upcoming-events-list.gjs
View File

@ -7,7 +7,7 @@ import ConditionalLoadingSpinner from "discourse/components/conditional-loading-
import DButton from "discourse/components/d-button"; import DButton from "discourse/components/d-button";
import PluginOutlet from "discourse/components/plugin-outlet"; import PluginOutlet from "discourse/components/plugin-outlet";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
import or from "truth-helpers/helpers/or"; import or from "truth-helpers/helpers/or";
import { isNotFullDayEvent } from "../lib/guess-best-date-format"; import { isNotFullDayEvent } from "../lib/guess-best-date-format";
@ -37,10 +37,10 @@ export default class UpcomingEventsList extends Component {
count = this.args.params?.count ?? DEFAULT_COUNT; count = this.args.params?.count ?? DEFAULT_COUNT;
upcomingDays = this.args.params?.upcomingDays ?? DEFAULT_UPCOMING_DAYS; upcomingDays = this.args.params?.upcomingDays ?? DEFAULT_UPCOMING_DAYS;
emptyMessage = I18n.t("discourse_post_event.upcoming_events_list.empty"); emptyMessage = i18n("discourse_post_event.upcoming_events_list.empty");
allDayLabel = I18n.t("discourse_post_event.upcoming_events_list.all_day"); allDayLabel = i18n("discourse_post_event.upcoming_events_list.all_day");
errorMessage = I18n.t("discourse_post_event.upcoming_events_list.error"); errorMessage = i18n("discourse_post_event.upcoming_events_list.error");
viewAllLabel = I18n.t("discourse_post_event.upcoming_events_list.view_all"); viewAllLabel = i18n("discourse_post_event.upcoming_events_list.view_all");
constructor() { constructor() {
super(...arguments); super(...arguments);
@ -64,7 +64,7 @@ export default class UpcomingEventsList extends Component {
const titleSetting = this.siteSettings.map_events_title; const titleSetting = this.siteSettings.map_events_title;
if (titleSetting === "") { if (titleSetting === "") {
return I18n.t("discourse_post_event.upcoming_events_list.title"); return i18n("discourse_post_event.upcoming_events_list.title");
} }
const categories = JSON.parse(titleSetting).map( const categories = JSON.parse(titleSetting).map(
@ -78,7 +78,7 @@ export default class UpcomingEventsList extends Component {
); );
return customTitleLookup?.custom_title; return customTitleLookup?.custom_title;
} else { } else {
return I18n.t("discourse_post_event.upcoming_events_list.title"); return i18n("discourse_post_event.upcoming_events_list.title");
} }
} }

6
assets/javascripts/discourse/initializers/add-upcoming-events-to-sidebar.js
View File

@ -1,5 +1,5 @@
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
export default { export default {
name: "add-upcoming-events-to-sidebar", name: "add-upcoming-events-to-sidebar",
@ -15,8 +15,8 @@ export default {
return class UpcomingEventsSectionLink extends baseSectionLink { return class UpcomingEventsSectionLink extends baseSectionLink {
name = "upcoming-events"; name = "upcoming-events";
route = "discourse-post-event-upcoming-events"; route = "discourse-post-event-upcoming-events";
text = I18n.t("discourse_post_event.upcoming_events.title"); text = i18n("discourse_post_event.upcoming_events.title");
title = I18n.t("discourse_post_event.upcoming_events.title"); title = i18n("discourse_post_event.upcoming_events.title");
}; };
}); });
}); });

4
assets/javascripts/discourse/initializers/disable-sort.js
View File

@ -1,6 +1,6 @@
import discourseComputed from "discourse/lib/decorators";
import { withSilencedDeprecations } from "discourse/lib/deprecated";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
import discourseComputed from "discourse-common/utils/decorators";
export default { export default {
name: "disable-sort", name: "disable-sort",

16
assets/javascripts/discourse/initializers/discourse-calendar.js
View File

@ -3,15 +3,15 @@ import $ from "jquery";
import { escape } from "pretty-text/sanitizer"; import { escape } from "pretty-text/sanitizer";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import getURL from "discourse/lib/get-url";
import { iconHTML } from "discourse/lib/icon-library";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import { cook } from "discourse/lib/text"; import { cook } from "discourse/lib/text";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
import { escapeExpression } from "discourse/lib/utilities"; import { escapeExpression } from "discourse/lib/utilities";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import getURL from "discourse-common/lib/get-url"; import { i18n } from "discourse-i18n";
import { iconHTML } from "discourse-common/lib/icon-library";
import I18n from "I18n";
import { formatEventName } from "../helpers/format-event-name"; import { formatEventName } from "../helpers/format-event-name";
import addRecurrentEvents from "../lib/add-recurrent-events"; import addRecurrentEvents from "../lib/add-recurrent-events";
import { colorToHex, contrastColor, stringToColor } from "../lib/colors"; import { colorToHex, contrastColor, stringToColor } from "../lib/colors";
@ -247,7 +247,7 @@ function initializeDiscourseCalendar(api) {
return class extends NotificationTypeBase { return class extends NotificationTypeBase {
get linkTitle() { get linkTitle() {
if (this.notification.data.title) { if (this.notification.data.title) {
return I18n.t(this.notification.data.title); return i18n(this.notification.data.title);
} else { } else {
return super.linkTitle; return super.linkTitle;
} }
@ -258,7 +258,7 @@ function initializeDiscourseCalendar(api) {
} }
get label() { get label() {
return I18n.t(this.notification.data.message); return i18n(this.notification.data.message);
} }
get description() { get description() {
@ -280,7 +280,7 @@ function initializeDiscourseCalendar(api) {
this.notification.data.message === this.notification.data.message ===
"discourse_post_event.notifications.invite_user_predefined_attendance_notification" "discourse_post_event.notifications.invite_user_predefined_attendance_notification"
) { ) {
return I18n.t(this.notification.data.message, { return i18n(this.notification.data.message, {
username: this.username, username: this.username,
}); });
} }
@ -881,7 +881,7 @@ function initializeDiscourseCalendar(api) {
); );
const timezoneButton = document.createElement("button"); const timezoneButton = document.createElement("button");
timezoneButton.title = I18n.t( timezoneButton.title = i18n(
"discourse_calendar.toggle_timezone_offset_title" "discourse_calendar.toggle_timezone_offset_title"
); );
timezoneButton.classList.add( timezoneButton.classList.add(
@ -984,7 +984,7 @@ function initializeDiscourseCalendar(api) {
startDate = _formatDateForGoogleApi(startDate, event.eventRange.def.allDay); startDate = _formatDateForGoogleApi(startDate, event.eventRange.def.allDay);
const link = document.createElement("a"); const link = document.createElement("a");
const title = I18n.t("discourse_calendar.add_to_calendar"); const title = i18n("discourse_calendar.add_to_calendar");
link.title = title; link.title = title;
link.appendChild(document.createTextNode(title)); link.appendChild(document.createTextNode(title));
link.href = ` link.href = `

2
assets/javascripts/discourse/initializers/discourse-group-timezones.js
View File

@ -1,7 +1,7 @@
import $ from "jquery"; import $ from "jquery";
import { getRegister } from "discourse/lib/get-owner";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import WidgetGlue from "discourse/widgets/glue"; import WidgetGlue from "discourse/widgets/glue";
import { getRegister } from "discourse-common/lib/get-owner";
export default { export default {
name: "discourse-group-timezones", name: "discourse-group-timezones",

6
assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs
View File

@ -1,5 +1,5 @@
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import I18n from "I18n"; import I18n, { i18n } from "discourse-i18n";
import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event"; import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event";
import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event";
import guessDateFormat from "../lib/guess-best-date-format"; import guessDateFormat from "../lib/guess-best-date-format";
@ -14,7 +14,7 @@ function _validEventPreview(eventContainer) {
if (I18n.lookup(statusLocaleKey, { locale: "en" })) { if (I18n.lookup(statusLocaleKey, { locale: "en" })) {
const statusContainer = document.createElement("div"); const statusContainer = document.createElement("div");
statusContainer.classList.add("event-preview-status"); statusContainer.classList.add("event-preview-status");
statusContainer.innerText = I18n.t(statusLocaleKey); statusContainer.innerText = i18n(statusLocaleKey);
eventContainer.appendChild(statusContainer); eventContainer.appendChild(statusContainer);
} }
@ -55,7 +55,7 @@ function _invalidEventPreview(eventContainer) {
"alert-error" "alert-error"
); );
eventContainer.classList.remove("discourse-post-event"); eventContainer.classList.remove("discourse-post-event");
eventContainer.innerText = I18n.t( eventContainer.innerText = i18n(
"discourse_post_event.preview.more_than_one_event" "discourse_post_event.preview.more_than_one_event"
); );
} }

4
assets/javascripts/discourse/initializers/event-relative-date.js
View File

@ -1,6 +1,6 @@
import { cancel } from "@ember/runloop"; import { cancel } from "@ember/runloop";
import { isTesting } from "discourse-common/config/environment"; import { isTesting } from "discourse/lib/environment";
import discourseLater from "discourse-common/lib/later"; import discourseLater from "discourse/lib/later";
import eventRelativeDate from "../lib/event-relative-date"; import eventRelativeDate from "../lib/event-relative-date";
function computeRelativeEventDates() { function computeRelativeEventDates() {

12
assets/javascripts/discourse/lib/calendar-locale.js
View File

@ -1,4 +1,4 @@
import I18n from "I18n"; import I18n, { i18n } from "discourse-i18n";
export function getCurrentBcp47Locale() { export function getCurrentBcp47Locale() {
return I18n.currentLocale().replace("_", "-").toLowerCase(); return I18n.currentLocale().replace("_", "-").toLowerCase();
@ -6,10 +6,10 @@ export function getCurrentBcp47Locale() {
export function getCalendarButtonsText() { export function getCalendarButtonsText() {
return { return {
today: I18n.t("discourse_calendar.toolbar_button.today"), today: i18n("discourse_calendar.toolbar_button.today"),
month: I18n.t("discourse_calendar.toolbar_button.month"), month: i18n("discourse_calendar.toolbar_button.month"),
week: I18n.t("discourse_calendar.toolbar_button.week"), week: i18n("discourse_calendar.toolbar_button.week"),
day: I18n.t("discourse_calendar.toolbar_button.day"), day: i18n("discourse_calendar.toolbar_button.day"),
list: I18n.t("discourse_calendar.toolbar_button.list"), list: i18n("discourse_calendar.toolbar_button.list"),
}; };
} }

4
assets/javascripts/discourse/lib/event-relative-date.js
View File

@ -1,4 +1,4 @@
import I18n from "I18n"; import { i18n } from "discourse-i18n";
import guessDateFormat from "./guess-best-date-format"; import guessDateFormat from "./guess-best-date-format";
function _computeCurrentEvent(container, endsAt) { function _computeCurrentEvent(container, endsAt) {
@ -8,7 +8,7 @@ function _computeCurrentEvent(container, endsAt) {
const text = document.createElement("span"); const text = document.createElement("span");
text.classList.add("text"); text.classList.add("text");
text.innerText = I18n.t("discourse_post_event.topic_title.ends_in_duration", { text.innerText = i18n("discourse_post_event.topic_title.ends_in_duration", {
duration: endsAt.from(moment()), duration: endsAt.from(moment()),
}); });
container.appendChild(text); container.appendChild(text);

2
assets/javascripts/discourse/models/discourse-post-event-event.js
View File

@ -1,8 +1,8 @@
import { tracked } from "@glimmer/tracking"; import { tracked } from "@glimmer/tracking";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { TrackedArray } from "@ember-compat/tracked-built-ins"; import { TrackedArray } from "@ember-compat/tracked-built-ins";
import { bind } from "discourse/lib/decorators";
import User from "discourse/models/user"; import User from "discourse/models/user";
import { bind } from "discourse-common/utils/decorators";
import DiscoursePostEventEventStats from "./discourse-post-event-event-stats"; import DiscoursePostEventEventStats from "./discourse-post-event-event-stats";
import DiscoursePostEventInvitee from "./discourse-post-event-invitee"; import DiscoursePostEventInvitee from "./discourse-post-event-invitee";

4
assets/javascripts/discourse/widgets/discourse-group-timezones-filter.js
View File

@ -1,6 +1,6 @@
import { throttle } from "@ember/runloop"; import { throttle } from "@ember/runloop";
import { createWidget } from "discourse/widgets/widget"; import { createWidget } from "discourse/widgets/widget";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
export default createWidget("discourse-group-timezones-filter", { export default createWidget("discourse-group-timezones-filter", {
tagName: "input.group-timezones-filter", tagName: "input.group-timezones-filter",
@ -22,7 +22,7 @@ export default createWidget("discourse-group-timezones-filter", {
buildAttributes() { buildAttributes() {
return { return {
type: "text", type: "text",
placeholder: I18n.t("group_timezones.search"), placeholder: i18n("group_timezones.search"),
}; };
}, },
}); });

4
assets/javascripts/discourse/widgets/discourse-group-timezones-header.js
View File

@ -1,13 +1,13 @@
import hbs from "discourse/widgets/hbs-compiler"; import hbs from "discourse/widgets/hbs-compiler";
import { createWidget } from "discourse/widgets/widget"; import { createWidget } from "discourse/widgets/widget";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
export default createWidget("discourse-group-timezones-header", { export default createWidget("discourse-group-timezones-header", {
tagName: "div.group-timezones-header", tagName: "div.group-timezones-header",
transform(attrs) { transform(attrs) {
return { return {
title: I18n.t("group_timezones.group_availability", { title: i18n("group_timezones.group_availability", {
group: attrs.group, group: attrs.group,
}), }),
}; };

13
package.json
View File

@ -1,15 +1,16 @@
{ {
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@discourse/lint-configs": "2.2.2", "@discourse/lint-configs": "2.4.0",
"ember-template-lint": "6.0.0", "ember-template-lint": "6.1.0",
"eslint": "9.15.0", "eslint": "9.19.0",
"prettier": "2.8.8" "prettier": "2.8.8"
}, },
"engines": { "engines": {
"node": ">= 18", "node": ">= 22",
"npm": "please-use-pnpm", "npm": "please-use-pnpm",
"yarn": "please-use-pnpm", "yarn": "please-use-pnpm",
"pnpm": ">= 9" "pnpm": "9.x"
} },
"packageManager": "pnpm@9.15.5"
} }

1317
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

10
test/javascripts/acceptance/notifications-test.js
View File

@ -1,7 +1,7 @@
import { click, visit } from "@ember/test-helpers"; import { click, visit } from "@ember/test-helpers";
import { test } from "qunit"; import { test } from "qunit";
import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers"; import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
acceptance("Discourse Calendar - Notifications", function (needs) { acceptance("Discourse Calendar - Notifications", function (needs) {
needs.user({ redesigned_user_menu_enabled: true }); needs.user({ redesigned_user_menu_enabled: true });
@ -117,7 +117,7 @@ acceptance("Discourse Calendar - Notifications", function (needs) {
assert.strictEqual( assert.strictEqual(
notifications[0].textContent.replaceAll(/\s+/g, " ").trim(), notifications[0].textContent.replaceAll(/\s+/g, " ").trim(),
`${I18n.t( `${i18n(
"discourse_post_event.notifications.before_event_reminder" "discourse_post_event.notifications.before_event_reminder"
)} Monthly Hangout #3`, )} Monthly Hangout #3`,
"before event reminder notification has the right content" "before event reminder notification has the right content"
@ -132,7 +132,7 @@ acceptance("Discourse Calendar - Notifications", function (needs) {
assert.strictEqual( assert.strictEqual(
notifications[1].textContent.replaceAll(/\s+/g, " ").trim(), notifications[1].textContent.replaceAll(/\s+/g, " ").trim(),
`${I18n.t( `${i18n(
"discourse_post_event.notifications.ongoing_event_reminder" "discourse_post_event.notifications.ongoing_event_reminder"
)} Fancy title and pants`, )} Fancy title and pants`,
"ongoing event reminder notification has the right content" "ongoing event reminder notification has the right content"
@ -147,7 +147,7 @@ acceptance("Discourse Calendar - Notifications", function (needs) {
assert.strictEqual( assert.strictEqual(
notifications[2].textContent.replaceAll(/\s+/g, " ").trim(), notifications[2].textContent.replaceAll(/\s+/g, " ").trim(),
`${I18n.t( `${i18n(
"discourse_post_event.notifications.after_event_reminder" "discourse_post_event.notifications.after_event_reminder"
)} Topic with event and after_event reminder`, )} Topic with event and after_event reminder`,
"after event reminder notification has the right content" "after event reminder notification has the right content"
@ -177,7 +177,7 @@ acceptance("Discourse Calendar - Notifications", function (needs) {
assert.strictEqual( assert.strictEqual(
notifications[4].textContent.replaceAll(/\s+/g, " ").trim(), notifications[4].textContent.replaceAll(/\s+/g, " ").trim(),
`${I18n.t( `${i18n(
"discourse_post_event.notifications.invite_user_predefined_attendance_notification", "discourse_post_event.notifications.invite_user_predefined_attendance_notification",
{ username: "apacer" } { username: "apacer" }
)} Asia Pacific team call`, )} Asia Pacific team call`,

6
test/javascripts/acceptance/post-event-builder-test.js
View File

@ -3,7 +3,7 @@ import { test } from "qunit";
import sinon from "sinon"; import sinon from "sinon";
import { acceptance } from "discourse/tests/helpers/qunit-helpers"; import { acceptance } from "discourse/tests/helpers/qunit-helpers";
import selectKit from "discourse/tests/helpers/select-kit-helper"; import selectKit from "discourse/tests/helpers/select-kit-helper";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
acceptance("Post event - composer", function (needs) { acceptance("Post event - composer", function (needs) {
needs.user({ admin: true, can_create_discourse_post_event: true }); needs.user({ admin: true, can_create_discourse_post_event: true });
@ -23,7 +23,7 @@ acceptance("Post event - composer", function (needs) {
await categoryChooser.selectRowByValue(2); await categoryChooser.selectRowByValue(2);
await click(".toolbar-popup-menu-options .dropdown-select-box-header"); await click(".toolbar-popup-menu-options .dropdown-select-box-header");
await click( await click(
`.toolbar-popup-menu-options *[data-name='${I18n.t( `.toolbar-popup-menu-options *[data-name='${i18n(
"discourse_post_event.builder_modal.attach" "discourse_post_event.builder_modal.attach"
)}']` )}']`
); );
@ -93,7 +93,7 @@ acceptance("Post event - composer", function (needs) {
await click(".toolbar-popup-menu-options .dropdown-select-box-header"); await click(".toolbar-popup-menu-options .dropdown-select-box-header");
await click( await click(
`.toolbar-popup-menu-options *[data-name='${I18n.t( `.toolbar-popup-menu-options *[data-name='${i18n(
"discourse_post_event.builder_modal.attach" "discourse_post_event.builder_modal.attach"
)}']` )}']`
); );

2
test/javascripts/acceptance/topic-calendar-holidays-test.js
View File

@ -1,7 +1,7 @@
import { visit } from "@ember/test-helpers"; import { visit } from "@ember/test-helpers";
import { test } from "qunit"; import { test } from "qunit";
import { cloneJSON } from "discourse/lib/object";
import { acceptance, fakeTime } from "discourse/tests/helpers/qunit-helpers"; import { acceptance, fakeTime } from "discourse/tests/helpers/qunit-helpers";
import { cloneJSON } from "discourse-common/lib/object";
import eventTopicFixture from "../helpers/event-topic-fixture"; import eventTopicFixture from "../helpers/event-topic-fixture";
acceptance("Discourse Calendar - Topic Calendar Holidays", function (needs) { acceptance("Discourse Calendar - Topic Calendar Holidays", function (needs) {

2
test/javascripts/acceptance/topic-title-decorator-test.js
View File

@ -1,9 +1,9 @@
import { visit } from "@ember/test-helpers"; import { visit } from "@ember/test-helpers";
import { test } from "qunit"; import { test } from "qunit";
import sinon from "sinon"; import sinon from "sinon";
import { cloneJSON } from "discourse/lib/object";
import discoveryFixtures from "discourse/tests/fixtures/discovery-fixtures"; import discoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers"; import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
import { cloneJSON } from "discourse-common/lib/object";
acceptance("Discourse Calendar - Event Title Decorator", function (needs) { acceptance("Discourse Calendar - Event Title Decorator", function (needs) {
needs.user(); needs.user();

24
test/javascripts/integration/components/upcoming-events-list-test.gjs
View File

@ -5,7 +5,7 @@ import { module, test } from "qunit";
import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { setupRenderingTest } from "discourse/tests/helpers/component-test";
import pretender, { response } from "discourse/tests/helpers/create-pretender"; import pretender, { response } from "discourse/tests/helpers/create-pretender";
import { fakeTime, queryAll } from "discourse/tests/helpers/qunit-helpers"; import { fakeTime, queryAll } from "discourse/tests/helpers/qunit-helpers";
import I18n from "discourse-i18n"; import { i18n } from "discourse-i18n";
import UpcomingEventsList, { import UpcomingEventsList, {
DEFAULT_TIME_FORMAT, DEFAULT_TIME_FORMAT,
} from "../../discourse/components/upcoming-events-list"; } from "../../discourse/components/upcoming-events-list";
@ -52,7 +52,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__heading") .dom(".upcoming-events-list__heading")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.title"), i18n("discourse_post_event.upcoming_events_list.title"),
"displays the title" "displays the title"
); );
@ -61,7 +61,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__empty-message") .dom(".upcoming-events-list__empty-message")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.empty"), i18n("discourse_post_event.upcoming_events_list.empty"),
"displays the empty list message" "displays the empty list message"
); );
}); });
@ -76,7 +76,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__heading") .dom(".upcoming-events-list__heading")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.title"), i18n("discourse_post_event.upcoming_events_list.title"),
"displays the title" "displays the title"
); );
@ -106,7 +106,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
(el) => el.innerText (el) => el.innerText
), ),
[ [
I18n.t("discourse_post_event.upcoming_events_list.all_day"), i18n("discourse_post_event.upcoming_events_list.all_day"),
moment(nextMonth).format(DEFAULT_TIME_FORMAT), moment(nextMonth).format(DEFAULT_TIME_FORMAT),
], ],
"displays the formatted time" "displays the formatted time"
@ -202,7 +202,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__view-all") .dom(".upcoming-events-list__view-all")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.view_all"), i18n("discourse_post_event.upcoming_events_list.view_all"),
"displays the view-all link" "displays the view-all link"
); );
@ -227,7 +227,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__heading") .dom(".upcoming-events-list__heading")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.title"), i18n("discourse_post_event.upcoming_events_list.title"),
"displays the title" "displays the title"
); );
@ -238,7 +238,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
(el) => el.innerText (el) => el.innerText
), ),
[ [
I18n.t("discourse_post_event.upcoming_events_list.all_day"), i18n("discourse_post_event.upcoming_events_list.all_day"),
moment(nextMonth).format("LLL"), moment(nextMonth).format("LLL"),
], ],
"displays the formatted time" "displays the formatted time"
@ -265,7 +265,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__heading") .dom(".upcoming-events-list__heading")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.title"), i18n("discourse_post_event.upcoming_events_list.title"),
"displays the title" "displays the title"
); );
@ -274,14 +274,14 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__error-message") .dom(".upcoming-events-list__error-message")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.error"), i18n("discourse_post_event.upcoming_events_list.error"),
"displays the error message" "displays the error message"
); );
assert assert
.dom(".upcoming-events-list__try-again") .dom(".upcoming-events-list__try-again")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.try_again"), i18n("discourse_post_event.upcoming_events_list.try_again"),
"displays the try again button" "displays the try again button"
); );
}); });
@ -298,7 +298,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
assert assert
.dom(".upcoming-events-list__heading") .dom(".upcoming-events-list__heading")
.hasText( .hasText(
I18n.t("discourse_post_event.upcoming_events_list.title"), i18n("discourse_post_event.upcoming_events_list.title"),
"displays the title" "displays the title"
); );