Fix lint issues

TypeStrong · Feb 18, 2024 · fe5e78f · fe5e78f
1 parent a485318
commit fe5e78f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/lib/internationalization/internationalization.ts b/src/lib/internationalization/internationalization.ts
@@ -39,7 +39,7 @@ import { ReflectionKind } from "../models/reflections/kind";
  *         // Define a translatable string with no arguments
  *         plugin_msg: [];
  *         // Define a translatable string requiring one argument
- *         plugin_msg_1: [string];
+ *         plugin_msg_0: [string];
  *     }
  * }
  * ```
@@ -74,11 +74,12 @@ export class Internationalization {
         (lang) => {
             // Make sure this isn't abused to load some random file by mistake
             ok(
-                /^[A-Za-z\-]+$/.test(lang),
+                /^[A-Za-z-]+$/.test(lang),
                 "Locale names may only contain letters and dashes",
             );
             try {
                 return new Map(
+                    // eslint-disable-next-line @typescript-eslint/no-var-requires
                     Object.entries(require(`./locales/${lang}.${ext}`)),
                 );
             } catch {
@@ -87,6 +88,22 @@ export class Internationalization {
         },
     );
 
+    /**
+     * Proxy object which supports dynamically translating
+     * all supported keys. This is generally used rather than the translate
+     * method so that renaming a key on the `translatable` object that contains
+     * all of the default translations will automatically update usage locations.
+     */
+    proxy: TranslationProxy = new Proxy(this, {
+        get(internationalization, key) {
+            return (...args: string[]) =>
+                internationalization.translate(
+                    key as never,
+                    ...(args as never),
+                );
+        },
+    }) as never as TranslationProxy;
+
     /**
      * If constructed without an application, will use the default language.
      * Intended for use in unit tests only.
@@ -247,17 +264,4 @@ export class Internationalization {
             ...this.allTranslations.keys(),
         ]).sort();
     }
-
-    /**
-     * Creates a proxy object which supports dynamically translating
-     * all supported keys. This is generally used rather than the translate
-     * method so that renaming a key on the `translatable` object that contains
-     * all of the default translations will automatically update usage locations.
-     */
-    proxy: TranslationProxy = new Proxy({} as TranslationProxy, {
-        get: ({}, key) => {
-            return (...args: string[]) =>
-                this.translate(key as never, ...(args as never));
-        },
-    });
 }
diff --git a/src/lib/utils/loggers.ts b/src/lib/utils/loggers.ts
@@ -47,7 +47,7 @@ const messagePrefixes = {
 const dummyTranslationProxy: TranslationProxy = new Proxy(
     {} as TranslationProxy,
     {
-        get: ({}, key) => {
+        get: (_target, key) => {
             return (...args: string[]) =>
                 String(key).replace(/\{(\d+)\}/g, (_, index) => {
                     return args[+index] ?? "(no placeholder)";

diff --git a/src/test/internationalization.test.ts b/src/test/internationalization.test.ts
@@ -38,6 +38,7 @@ describe("Locales", () => {
 
     for (const locale of readdirSync(localeRoot)) {
         it(`${locale} defines a valid locale`, () => {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
             const translations = require(join(localeRoot, locale)) as Record<
                 string,
                 string