Skip to content
This repository was archived by the owner on Jul 14, 2025. It is now read-only.

Commit 444440a

Browse files
davidtaylorhqdavidtaylorhq
authored
DEV: Bump dependencies and fix linting (#630)
1 parent e213c7d commit 444440a

28 files changed

+857
-711
lines changed

‎assets/javascripts/discourse/components/assign-actions-dropdown.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { action } from "@ember/object";
22
import { classNames } from "@ember-decorators/component";
3-
import I18n from "I18n";
3+
import { i18n } from "discourse-i18n";
44
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
55
import { selectKitOptions } from "select-kit/components/select-kit";
66

@@ -22,16 +22,16 @@ export default class AssignActionsDropdown extends DropdownSelectBoxComponent {
2222
{
2323
id: "unassign",
2424
icon: this.group ? "group-times" : "user-xmark",
25-
name: I18n.t("discourse_assign.unassign.title"),
26-
description: I18n.t("discourse_assign.unassign.help", {
25+
name: i18n("discourse_assign.unassign.title"),
26+
description: i18n("discourse_assign.unassign.help", {
2727
username: this.assignee,
2828
}),
2929
},
3030
{
3131
id: "reassign",
3232
icon: "users",
33-
name: I18n.t("discourse_assign.reassign.title"),
34-
description: I18n.t("discourse_assign.reassign.help"),
33+
name: i18n("discourse_assign.reassign.title"),
34+
description: i18n("discourse_assign.reassign.help"),
3535
},
3636
]);
3737
}
@@ -43,8 +43,8 @@ export default class AssignActionsDropdown extends DropdownSelectBoxComponent {
4343
options = options.concat({
4444
id: `unassign_post_${postId}`,
4545
icon: assignee.username ? "user-xmark" : "group-times",
46-
name: I18n.t("discourse_assign.unassign_post.title"),
47-
description: I18n.t("discourse_assign.unassign_post.help", {
46+
name: i18n("discourse_assign.unassign_post.title"),
47+
description: i18n("discourse_assign.unassign_post.help", {
4848
username: assignee.username || assignee.name,
4949
}),
5050
});

‎assets/javascripts/discourse/components/assigned-to-post.gjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { action } from "@ember/object";
33
import { service } from "@ember/service";
44
import DButton from "discourse/components/d-button";
55
import DropdownMenu from "discourse/components/dropdown-menu";
6-
import icon from "discourse-common/helpers/d-icon";
7-
import i18n from "discourse-common/helpers/i18n";
6+
import icon from "discourse/helpers/d-icon";
7+
import { i18n } from "discourse-i18n";
88
import DMenu from "float-kit/components/d-menu";
99

1010
export default class AssignedToPost extends Component {

‎assets/javascripts/discourse/components/assignment.gjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { TextArea } from "@ember/legacy-built-in-components";
44
import { on } from "@ember/modifier";
55
import { action } from "@ember/object";
66
import { service } from "@ember/service";
7-
import icon from "discourse-common/helpers/d-icon";
8-
import i18n from "discourse-common/helpers/i18n";
7+
import icon from "discourse/helpers/d-icon";
8+
import { i18n } from "discourse-i18n";
99
import ComboBox from "select-kit/components/combo-box";
1010
import not from "truth-helpers/helpers/not";
1111
import AssigneeChooser from "./assignee-chooser";

‎assets/javascripts/discourse/components/modal/assign-user.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
22
import { action } from "@ember/object";
33
import { service } from "@ember/service";
44
import { TrackedObject } from "@ember-compat/tracked-built-ins";
5-
import I18n from "I18n";
5+
import { i18n } from "discourse-i18n";
66

77
export default class AssignUser extends Component {
88
@service taskActions;
@@ -26,7 +26,7 @@ export default class AssignUser extends Component {
2626
break;
2727
}
2828

29-
return I18n.t(
29+
return i18n(
3030
`discourse_assign.assign${i18nSuffix}.${
3131
this.model.reassign ? "reassign_title" : "title"
3232
}`

‎assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import DButton from "discourse/components/d-button";
66
import DModal from "discourse/components/d-modal";
77
import DModalCancel from "discourse/components/d-modal-cancel";
88
import { popupAjaxError } from "discourse/lib/ajax-error";
9-
import I18n from "I18n";
9+
import { i18n } from "discourse-i18n";
1010
import TopicAssignments from "../topic-assignments";
1111

1212
export default class EditTopicAssignments extends Component {
@@ -16,9 +16,9 @@ export default class EditTopicAssignments extends Component {
1616

1717
get title() {
1818
if (this.topic.isAssigned() || this.topic.hasAssignedPosts()) {
19-
return I18n.t("edit_assignments_modal.title");
19+
return i18n("edit_assignments_modal.title");
2020
} else {
21-
return I18n.t("discourse_assign.assign_modal.title");
21+
return i18n("discourse_assign.assign_modal.title");
2222
}
2323
}
2424

‎assets/javascripts/discourse/components/remind-assigns-frequency.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@ember/component";
2-
import discourseComputed from "discourse-common/utils/decorators";
3-
import I18n from "I18n";
2+
import discourseComputed from "discourse/lib/decorators";
3+
import { i18n } from "discourse-i18n";
44

55
export default class RemindAssignsFrequency extends Component {
66
@discourseComputed(
@@ -22,7 +22,7 @@ export default class RemindAssignsFrequency extends Component {
2222
@discourseComputed("user.reminders_frequency")
2323
availableFrequencies(userRemindersFrequency) {
2424
return userRemindersFrequency.map((freq) => ({
25-
name: I18n.t(freq.name),
25+
name: i18n(freq.name),
2626
value: freq.value,
2727
selected: false,
2828
}));

‎assets/javascripts/discourse/components/topic-assignments.gjs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import Component from "@glimmer/component";
22
import { tracked } from "@glimmer/tracking";
33
import { action } from "@ember/object";
4-
import i18n from "discourse-common/helpers/i18n";
5-
import I18n from "I18n";
4+
import { i18n } from "discourse-i18n";
65
import ComboBox from "select-kit/components/combo-box";
76
import Assignment from "./assignment";
87

@@ -21,9 +20,9 @@ export default class TopicAssignments extends Component {
2120
#toComboBoxOption(assignment) {
2221
const option = { id: assignment.id };
2322
if (assignment.targetType === "Topic") {
24-
option.name = I18n.t("edit_assignments_modal.topic");
23+
option.name = i18n("edit_assignments_modal.topic");
2524
} else {
26-
option.name = `${I18n.t("edit_assignments_modal.post")} #${
25+
option.name = `${i18n("edit_assignments_modal.post")} #${
2726
assignment.postNumber
2827
}`;
2928
}

‎assets/javascripts/discourse/components/topic-level-assign-menu.js‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { getOwner } from "@ember/application";
22
import { htmlSafe } from "@ember/template";
33
import { renderAvatar } from "discourse/helpers/user-avatar";
4-
import { iconHTML } from "discourse-common/lib/icon-library";
5-
import I18n from "I18n";
4+
import { iconHTML } from "discourse/lib/icon-library";
5+
import { i18n } from "discourse-i18n";
66
import EditTopicAssignments from "../components/modal/edit-topic-assignments";
77

88
const DEPENDENT_KEYS = [
@@ -113,7 +113,7 @@ function extractPostId(buttonId) {
113113

114114
function editAssignmentsButton() {
115115
const icon = iconHTML("pencil");
116-
const label = I18n.t("discourse_assign.topic_level_menu.edit_assignments");
116+
const label = i18n("discourse_assign.topic_level_menu.edit_assignments");
117117
return {
118118
id: "reassign",
119119
name: htmlSafe(label),
@@ -123,9 +123,7 @@ function editAssignmentsButton() {
123123

124124
function reassignToSelfButton() {
125125
const icon = iconHTML("user-plus");
126-
const label = I18n.t(
127-
"discourse_assign.topic_level_menu.reassign_topic_to_me"
128-
);
126+
const label = i18n("discourse_assign.topic_level_menu.reassign_topic_to_me");
129127
return {
130128
id: "reassign-self",
131129
name: htmlSafe(label),
@@ -139,10 +137,9 @@ function unassignFromTopicButton(topic) {
139137
const icon = topic.assigned_to_user
140138
? avatarHtml(topic.assigned_to_user, "small")
141139
: iconHTML("user-xmark");
142-
const label = I18n.t(
143-
"discourse_assign.topic_level_menu.unassign_from_topic",
144-
{ username }
145-
);
140+
const label = i18n("discourse_assign.topic_level_menu.unassign_from_topic", {
141+
username,
142+
});
146143

147144
return {
148145
id: "unassign",
@@ -173,11 +170,11 @@ function unassignFromPostButton(postId, assignment) {
173170
icon = iconHTML("group-times");
174171
}
175172

176-
const label = I18n.t("discourse_assign.topic_level_menu.unassign_from_post", {
173+
const label = i18n("discourse_assign.topic_level_menu.unassign_from_post", {
177174
assignee,
178175
post_number: assignment.post_number,
179176
});
180-
const dataName = I18n.t(
177+
const dataName = i18n(
181178
"discourse_assign.topic_level_menu.unassign_from_post_help",
182179
{
183180
assignee,
@@ -193,14 +190,14 @@ function unassignFromPostButton(postId, assignment) {
193190

194191
function topicLevelUnassignButton(assignees) {
195192
const avatars = topicLevelUnassignButtonAvatars(assignees);
196-
const label = `<span class="unassign-label">${I18n.t(
193+
const label = `<span class="unassign-label">${i18n(
197194
"discourse_assign.topic_level_menu.unassign_with_ellipsis"
198195
)}</span>`;
199196

200197
return {
201198
id: null,
202199
name: htmlSafe(
203-
I18n.t("discourse_assign.topic_level_menu.unassign_with_ellipsis")
200+
i18n("discourse_assign.topic_level_menu.unassign_with_ellipsis")
204201
),
205202
label: htmlSafe(`${avatars}${label}`),
206203
};

‎assets/javascripts/discourse/components/user-menu/assigns-list.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { set } from "@ember/object";
22
import { sort } from "@ember/object/computed";
33
import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
4-
import I18n from "I18n";
4+
import { i18n } from "discourse-i18n";
55
import UserMenuAssignsListEmptyState from "./assigns-list-empty-state";
66

77
export default class UserMenuAssignNotificationsList extends UserMenuNotificationsList {
@@ -14,15 +14,15 @@ export default class UserMenuAssignNotificationsList extends UserMenuNotificatio
1414
}
1515

1616
get dismissTitle() {
17-
return I18n.t("user.dismiss_assigned_tooltip");
17+
return i18n("user.dismiss_assigned_tooltip");
1818
}
1919

2020
get showAllHref() {
2121
return `${this.currentUser.path}/activity/assigned`;
2222
}
2323

2424
get showAllTitle() {
25-
return I18n.t("user_menu.view_all_assigned");
25+
return i18n("user_menu.view_all_assigned");
2626
}
2727

2828
get itemsCacheKey() {
@@ -47,7 +47,7 @@ export default class UserMenuAssignNotificationsList extends UserMenuNotificatio
4747
}
4848

4949
get dismissConfirmationText() {
50-
return I18n.t("notifications.dismiss_confirmation.body.assigns", {
50+
return i18n("notifications.dismiss_confirmation.body.assigns", {
5151
count: this._unreadAssignedNotificationsCount,
5252
});
5353
}

‎assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
3-
import I18n from "I18n";
3+
import { i18n } from "discourse-i18n";
44

55
export default class AssignableInteractionFields extends Component {
66
assignableLevelOptions = [
7-
{ name: I18n.t("groups.alias_levels.nobody"), value: 0 },
8-
{ name: I18n.t("groups.alias_levels.only_admins"), value: 1 },
9-
{ name: I18n.t("groups.alias_levels.mods_and_admins"), value: 2 },
10-
{ name: I18n.t("groups.alias_levels.members_mods_and_admins"), value: 3 },
11-
{ name: I18n.t("groups.alias_levels.owners_mods_and_admins"), value: 4 },
12-
{ name: I18n.t("groups.alias_levels.everyone"), value: 99 },
7+
{ name: i18n("groups.alias_levels.nobody"), value: 0 },
8+
{ name: i18n("groups.alias_levels.only_admins"), value: 1 },
9+
{ name: i18n("groups.alias_levels.mods_and_admins"), value: 2 },
10+
{ name: i18n("groups.alias_levels.members_mods_and_admins"), value: 3 },
11+
{ name: i18n("groups.alias_levels.owners_mods_and_admins"), value: 4 },
12+
{ name: i18n("groups.alias_levels.everyone"), value: 99 },
1313
];
1414

1515
get assignableLevel() {

0 commit comments

Comments
 (0)