Skip to content

Commit b5ee7b7

Browse files
committed
fix: event worker locale context
1 parent d10a7fa commit b5ee7b7

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

packages/i18n/src/hooks.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ export function locale(locale?: Locale): CommandLocalizationContext {
3131
const detectedLocale: Locale = locale || commandkit.config.defaultLocale;
3232

3333
return {
34-
t: i18n.getFixedT(context.event),
34+
t: i18n.getFixedT(
35+
`event_${context.namespace ? `${context.namespace}_` : ''}${context.event}`,
36+
),
3537
locale: detectedLocale,
3638
i18n,
3739
isEventWorker: true,

packages/i18n/src/i18n.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
228228
for (const file of files) {
229229
if (file.isFile()) {
230230
const ext = extname(file.name);
231+
const parentFolder = file.parentPath.split('/').pop();
232+
const namespace =
233+
parentFolder?.startsWith('(') && parentFolder?.endsWith(')')
234+
? parentFolder?.slice(1, -1)
235+
: null;
231236

232237
if (!/\.json$/.test(ext)) continue;
233238

@@ -239,7 +244,9 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
239244
} else {
240245
name = basename(file.name, ext);
241246
}
242-
namespaces.add(`${isEvent ? 'event_' : ''}${name}`);
247+
namespaces.add(
248+
`${isEvent ? 'event_' : ''}${namespace ? `${namespace}_` : ''}${name}`,
249+
);
243250

244251
const locale = basename(file.parentPath);
245252

@@ -253,6 +260,11 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
253260
}
254261
} else if (file.isFile()) {
255262
const ext = extname(file.name);
263+
const parentFolder = file.parentPath.split('/').pop();
264+
const namespace =
265+
parentFolder?.startsWith('(') && parentFolder?.endsWith(')')
266+
? parentFolder?.slice(1, -1)
267+
: null;
256268

257269
if (!/\.json$/.test(ext)) continue;
258270

@@ -264,7 +276,9 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
264276
} else {
265277
name = basename(file.name, ext);
266278
}
267-
namespaces.add(`${isEvent ? 'event_' : ''}${name}`);
279+
namespaces.add(
280+
`${isEvent ? 'event_' : ''}${namespace ? `${namespace}_` : ''}${name}`,
281+
);
268282

269283
const locale = basename(file.parentPath);
270284

0 commit comments

Comments
 (0)