diff --git a/assets/javascripts/discourse/initializers/discourse-topic-voting.js b/assets/javascripts/discourse/initializers/discourse-topic-voting.js index 23e4d62..c6b8036 100644 --- a/assets/javascripts/discourse/initializers/discourse-topic-voting.js +++ b/assets/javascripts/discourse/initializers/discourse-topic-voting.js @@ -1,6 +1,6 @@ import { withPluginApi } from "discourse/lib/plugin-api"; import NavItem from "discourse/models/nav-item"; -import I18n from "I18n"; +import { i18n } from "discourse-i18n"; export default { name: "discourse-topic-voting", @@ -13,7 +13,7 @@ export default { "controller:full-page-search" ); pageSearchController.sortOrders.pushObject({ - name: I18n.t("search.most_votes"), + name: i18n("search.most_votes"), id: 5, term: "order:votes", }); diff --git a/assets/javascripts/discourse/pre-initializers/extend-category-for-voting.js b/assets/javascripts/discourse/pre-initializers/extend-category-for-voting.js index 07dd6b4..f0f150b 100644 --- a/assets/javascripts/discourse/pre-initializers/extend-category-for-voting.js +++ b/assets/javascripts/discourse/pre-initializers/extend-category-for-voting.js @@ -1,5 +1,5 @@ import { withPluginApi } from "discourse/lib/plugin-api"; -import I18n from "I18n"; +import { i18n } from "discourse-i18n"; function initialize(api) { api.addPostClassesCallback((post) => { @@ -18,7 +18,7 @@ function initialize(api) { let title = ""; if (topic.user_voted) { - title = ` title='${I18n.t("topic_voting.voted")}'`; + title = ` title='${i18n("topic_voting.voted")}'`; } let userVotedClass = topic.user_voted ? " voted" : ""; @@ -26,7 +26,7 @@ function initialize(api) { `` ); - buffer.push(I18n.t("topic_voting.votes", { count: topic.vote_count })); + buffer.push(i18n("topic_voting.votes", { count: topic.vote_count })); buffer.push(""); if (buffer.length > 0) { diff --git a/assets/javascripts/discourse/routes/user-activity-votes.js b/assets/javascripts/discourse/routes/user-activity-votes.js index 8f4aa40..23d5c73 100644 --- a/assets/javascripts/discourse/routes/user-activity-votes.js +++ b/assets/javascripts/discourse/routes/user-activity-votes.js @@ -1,6 +1,6 @@ import UserAction from "discourse/models/user-action"; import UserTopicListRoute from "discourse/routes/user-topic-list"; -import I18n from "I18n"; +import { i18n } from "discourse-i18n"; export default class UserActivityVotes extends UserTopicListRoute { userActionType = UserAction.TYPES.topics; @@ -20,8 +20,8 @@ export default class UserActivityVotes extends UserTopicListRoute { emptyState() { const user = this.modelFor("user"); const title = this.isCurrentUser(user) - ? I18n.t("topic_voting.no_votes_title_self") - : I18n.t("topic_voting.no_votes_title_others", { + ? i18n("topic_voting.no_votes_title_self") + : i18n("topic_voting.no_votes_title_others", { username: user.username, }); diff --git a/assets/javascripts/discourse/widgets/remove-vote.js b/assets/javascripts/discourse/widgets/remove-vote.js index a8d4883..e6a1b69 100644 --- a/assets/javascripts/discourse/widgets/remove-vote.js +++ b/assets/javascripts/discourse/widgets/remove-vote.js @@ -1,6 +1,6 @@ +import { iconNode } from "discourse/lib/icon-library"; import { createWidget } from "discourse/widgets/widget"; -import { iconNode } from "discourse-common/lib/icon-library"; -import I18n from "I18n"; +import { i18n } from "discourse-i18n"; export default createWidget("remove-vote", { tagName: "div.remove-vote", @@ -10,7 +10,7 @@ export default createWidget("remove-vote", { }, html() { - return [iconNode("xmark"), I18n.t("topic_voting.remove_vote")]; + return [iconNode("xmark"), i18n("topic_voting.remove_vote")]; }, click() { diff --git a/assets/javascripts/discourse/widgets/vote-box.js b/assets/javascripts/discourse/widgets/vote-box.js index e20e0a8..829a199 100644 --- a/assets/javascripts/discourse/widgets/vote-box.js +++ b/assets/javascripts/discourse/widgets/vote-box.js @@ -2,7 +2,7 @@ import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import RawHtml from "discourse/widgets/raw-html"; import { createWidget } from "discourse/widgets/widget"; -import I18n from "I18n"; +import { i18n } from "discourse-i18n"; export default createWidget("vote-box", { tagName: "div.voting-wrapper", @@ -27,7 +27,7 @@ export default createWidget("vote-box", { if (state.votesAlert > 0) { const html = "