fix: events locale

Author: twlite

apps/test-bot/src/app/events/messageCreate/say-hi.ts

@@ -1,7 +1,9 @@
+import { locale } from '@commandkit/i18n';
 import type { Message } from 'discord.js';
 
 export default function (message: Message) {
+  const { t } = locale(message.guild?.preferredLocale);
   if (!message.author.bot && message.content === 'hello') {
-    message.reply('hi!');
+    message.reply(t('say-hi'));
   }
 }

apps/test-bot/src/app/locales/en-US/messageCreate.event.json

@@ -0,0 +1,3 @@
+{
+    "say-hi": "Hi!"
+}

apps/test-bot/src/app/locales/fr/messageCreate.event.json

@@ -0,0 +1,3 @@
+{
+    "say-hi": "Salut!"
+}

packages/i18n/src/hooks.ts

@@ -31,9 +31,7 @@ export function locale(locale?: Locale): CommandLocalizationContext {
     const detectedLocale: Locale = locale || commandkit.config.defaultLocale;
 
     return {
-      t: i18n.getFixedT(
-        `event_${context.namespace ? `${context.namespace}_` : ''}${context.event}`,
-      ),
+      t: i18n.getFixedT(detectedLocale, `${context.event}.event`),
       locale: detectedLocale,
       i18n,
       isEventWorker: true,

packages/i18n/src/i18n.ts

@@ -228,25 +228,13 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
         for (const file of files) {
           if (file.isFile()) {
             const ext = extname(file.name);
-            const parentFolder = file.parentPath.split('/').pop();
-            const namespace =
-              parentFolder?.startsWith('(') && parentFolder?.endsWith(')')
-                ? parentFolder?.slice(1, -1)
-                : null;
 
             if (!/\.json$/.test(ext)) continue;
 
-            let name: string;
             const isEvent = eventFilePattern.test(file.name);
-            // Handle event files specially
-            if (isEvent) {
-              name = file.name.replace('.event.json', '');
-            } else {
-              name = basename(file.name, ext);
-            }
-            namespaces.add(
-              `${isEvent ? 'event_' : ''}${namespace ? `${namespace}_` : ''}${name}`,
-            );
+
+            const name = basename(file.name, ext);
+            namespaces.add(name);
 
             const locale = basename(file.parentPath);
 
@@ -260,34 +248,22 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
         }
       } else if (file.isFile()) {
         const ext = extname(file.name);
-        const parentFolder = file.parentPath.split('/').pop();
-        const namespace =
-          parentFolder?.startsWith('(') && parentFolder?.endsWith(')')
-            ? parentFolder?.slice(1, -1)
-            : null;
 
         if (!/\.json$/.test(ext)) continue;
 
-        let name: string;
         const isEvent = eventFilePattern.test(file.name);
-        // Handle event files specially
-        if (isEvent) {
-          name = file.name.replace('.event.json', '');
-        } else {
-          name = basename(file.name, ext);
-        }
-        namespaces.add(
-          `${isEvent ? 'event_' : ''}${namespace ? `${namespace}_` : ''}${name}`,
-        );
+        const name = basename(file.name, ext);
+        namespaces.add(name);
 
         const locale = basename(file.parentPath);
 
-        if (!isEvent)
+        if (!isEvent) {
           await this.loadMetadata(
             join(file.parentPath, file.name),
             locale,
             name,
           );
+        }
       }
     }