consistently use import { i18n } from "discourse-i18n"; in all

js files

Author: SamSaffron

assets/javascripts/discourse/components/ai-composer-helper-menu.gjs

@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { getOwner } from "@ember/owner";
 import { service } from "@ember/service";
-import I18n from "discourse-i18n";
+import { i18n } from "discourse-i18n";
 import DToast from "float-kit/components/d-toast";
 import DToastInstance from "float-kit/lib/d-toast-instance";
 import AiHelperOptionsList from "../components/ai-helper-options-list";
@@ -45,7 +45,7 @@ export default class AiComposerHelperMenu extends Component {
           this.siteSettings.available_locales
         );
         const locale = availableLocales.find((l) => l.value === siteLocale);
-        const translatedName = I18n.t(
+        const translatedName = i18n(
           "discourse_ai.ai_helper.context_menu.translate_prompt",
           {
             language: locale.name,
@@ -90,7 +90,7 @@ export default class AiComposerHelperMenu extends Component {
       data: {
         theme: "error",
         icon: "triangle-exclamation",
-        message: I18n.t("discourse_ai.ai_helper.no_content_error"),
+        message: i18n("discourse_ai.ai_helper.no_content_error"),
       },
     };
 

assets/javascripts/discourse/components/ai-forced-tool-strategy-selector.gjs

@@ -1,20 +1,20 @@
 import { computed } from "@ember/object";
-import I18n from "discourse-i18n";
+import { i18n } from "discourse-i18n";
 import ComboBox from "select-kit/components/combo-box";
 
 export default ComboBox.extend({
   content: computed(function () {
     const content = [
       {
         id: -1,
-        name: I18n.t("discourse_ai.ai_persona.tool_strategies.all"),
+        name: i18n("discourse_ai.ai_persona.tool_strategies.all"),
       },
     ];
 
     [1, 2, 5].forEach((i) => {
       content.push({
         id: i,
-        name: I18n.t("discourse_ai.ai_persona.tool_strategies.replies", {
+        name: i18n("discourse_ai.ai_persona.tool_strategies.replies", {
           count: i,
         }),
       });

assets/javascripts/discourse/components/ai-llm-editor-form.gjs

@@ -12,8 +12,7 @@ import DButton from "discourse/components/d-button";
 import Avatar from "discourse/helpers/bound-avatar-template";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import icon from "discourse-common/helpers/d-icon";
-import i18n from "discourse-common/helpers/i18n";
-import I18n from "discourse-i18n";
+import { i18n } from "discourse-i18n";
 import AdminUser from "admin/models/admin-user";
 import ComboBox from "select-kit/components/combo-box";
 import DTooltip from "float-kit/components/d-tooltip";
@@ -41,7 +40,7 @@ export default class AiLlmEditorForm extends Component {
 
   get selectedProviders() {
     const t = (provName) => {
-      return I18n.t(`discourse_ai.llms.providers.${provName}`);
+      return i18n(`discourse_ai.llms.providers.${provName}`);
     };
 
     return this.args.llms.resultSetMeta.providers.map((prov) => {
@@ -54,7 +53,7 @@ export default class AiLlmEditorForm extends Component {
   }
 
   get testErrorMessage() {
-    return I18n.t("discourse_ai.llms.tests.failure", { error: this.testError });
+    return i18n("discourse_ai.llms.tests.failure", { error: this.testError });
   }
 
   get displayTestResult() {
@@ -74,7 +73,7 @@ export default class AiLlmEditorForm extends Component {
     }
 
     const localized = usedBy.map((m) => {
-      return I18n.t(`discourse_ai.llms.usage.${m.type}`, {
+      return i18n(`discourse_ai.llms.usage.${m.type}`, {
         persona: m.name,
       });
     });
@@ -88,7 +87,7 @@ export default class AiLlmEditorForm extends Component {
   }
 
   get inUseWarning() {
-    return I18n.t("discourse_ai.llms.in_use_warning", {
+    return i18n("discourse_ai.llms.in_use_warning", {
       settings: this.modulesUsingModel,
       count: this.args.model.used_by.length,
     });
@@ -135,7 +134,7 @@ export default class AiLlmEditorForm extends Component {
         this.router.transitionTo("adminPlugins.show.discourse-ai-llms.index");
       } else {
         this.toasts.success({
-          data: { message: I18n.t("discourse_ai.llms.saved") },
+          data: { message: i18n("discourse_ai.llms.saved") },
           duration: 2000,
         });
       }
@@ -183,7 +182,7 @@ export default class AiLlmEditorForm extends Component {
   @action
   delete() {
     return this.dialog.confirm({
-      message: I18n.t("discourse_ai.llms.confirm_delete"),
+      message: i18n("discourse_ai.llms.confirm_delete"),
       didConfirm: () => {
         return this.args.model
           .destroyRecord()

assets/javascripts/discourse/components/ai-llm-quota-editor.gjs

@@ -5,7 +5,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
-import I18n from "discourse-i18n";
+import { i18n } from "discourse-i18n";
 import DurationSelector from "./ai-quota-duration-selector";
 import AiLlmQuotaModal from "./modal/ai-llm-quota-modal";
 
@@ -99,16 +99,16 @@ export default class AiLlmQuotaEditor extends Component {
       <table class="ai-llm-quotas__table">
         <thead class="ai-llm-quotas__table-head">
           <tr class="ai-llm-quotas__header-row">
-            <th class="ai-llm-quotas__header">{{I18n.t
+            <th class="ai-llm-quotas__header">{{i18n
                 "discourse_ai.llms.quotas.group"
               }}</th>
-            <th class="ai-llm-quotas__header">{{I18n.t
+            <th class="ai-llm-quotas__header">{{i18n
                 "discourse_ai.llms.quotas.max_tokens"
               }}</th>
-            <th class="ai-llm-quotas__header">{{I18n.t
+            <th class="ai-llm-quotas__header">{{i18n
                 "discourse_ai.llms.quotas.max_usages"
               }}</th>
-            <th class="ai-llm-quotas__header">{{I18n.t
+            <th class="ai-llm-quotas__header">{{i18n
                 "discourse_ai.llms.quotas.duration"
               }}</th>
             <th

assets/javascripts/discourse/components/ai-llm-selector.js

@@ -1,6 +1,6 @@
 import { computed } from "@ember/object";
 import { observes } from "@ember-decorators/object";
-import I18n from "discourse-i18n";
+import { i18n } from "discourse-i18n";
 import ComboBox from "select-kit/components/combo-box";
 import { selectKitOptions } from "select-kit/components/select-kit";
 
@@ -18,7 +18,7 @@ export default class AiLlmSelector extends ComboBox {
     return [
       {
         id: "blank",
-        name: I18n.t("discourse_ai.ai_persona.no_llm_selected"),
+        name: i18n("discourse_ai.ai_persona.no_llm_selected"),
       },
     ].concat(this.llms);
   }

assets/javascripts/discourse/components/ai-llms-list-editor.gjs

@@ -5,8 +5,7 @@ import { service } from "@ember/service";
 import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
 import DButton from "discourse/components/d-button";
 import DPageSubheader from "discourse/components/d-page-subheader";
-import i18n from "discourse-common/helpers/i18n";
-import I18n from "discourse-i18n";
+import { i18n } from "discourse-i18n";
 import AdminSectionLandingItem from "admin/components/admin-section-landing-item";
 import AdminSectionLandingWrapper from "admin/components/admin-section-landing-wrapper";
 import DTooltip from "float-kit/components/d-tooltip";
@@ -38,7 +37,7 @@ export default class AiLlmsListEditor extends Component {
 
     key = `discourse_ai.llms.model_description.${key}`;
     if (I18n.lookup(key, { ignoreMissing: true })) {
-      return I18n.t(key);
+      return i18n(key);
     }
     return "";
   }
@@ -72,7 +71,7 @@ export default class AiLlmsListEditor extends Component {
     const options = [
       {
         id: "none",
-        name: I18n.t("discourse_ai.llms.preconfigured.fake"),
+        name: i18n("discourse_ai.llms.preconfigured.fake"),
         provider: "fake",
       },
     ];
@@ -114,11 +113,11 @@ export default class AiLlmsListEditor extends Component {
 
   localizeUsage(usage) {
     if (usage.type === "ai_persona") {
-      return I18n.t("discourse_ai.llms.usage.ai_persona", {
+      return i18n("discourse_ai.llms.usage.ai_persona", {
         persona: usage.name,
       });
     } else {
-      return I18n.t("discourse_ai.llms.usage." + usage.type);
+      return i18n("discourse_ai.llms.usage." + usage.type);
     }
   }