Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ module.exports = fp(async (fastify, options) => {
});
}

fastify.addHook('onRequest', async request => {
request.moduleName = options.moduleName;
});

if (!fastify.hasDecorator(options.name)) {
fastify.register(require('@kne/fastify-namespace'), {
name: options.name,
Expand Down Expand Up @@ -115,8 +111,23 @@ module.exports = fp(async (fastify, options) => {
const result = options.acceptLanguage === '*' || options.acceptLanguage.split(',').includes(lang) ? lang : options.defaultLocale;

localeCache.set(cacheKey, result);

return result;
}
],
[
'withLocale',
request => {
return async moduleName => {
const locale = fastify[options.name].getRequestLocale(request);
const intl = await fastify[options.name].createIntl(locale, moduleName);
return {
locale,
intl,
t: (id, values) => intl.formatMessage({ id }, values)
};
};
}
]
],
onMount: name => {
Expand All @@ -127,10 +138,12 @@ module.exports = fp(async (fastify, options) => {
locale && loadMessage(locale, name);
}
});
fastify.addHook('preHandler', async request => {
request.locale = fastify[options.name].getRequestLocale(request);
request.intl = await fastify[options.name].createIntl(request.locale, request.moduleName);
request.t = (id, values) => request.intl.formatMessage({ id }, values);
fastify.addHook('onRequest', async request => {
request.withLocale = fastify[options.name].withLocale(request);
const props = await request.withLocale(options.moduleName);
Object.keys(props).forEach(name => {
request[name] = props[name];
});
});
}
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kne/fastify-intl",
"version": "0.1.2",
"version": "0.1.3",
"description": "`@kne/fastify-intl` 是一个专为 Fastify 项目设计的国际化解决方案插件。它基于业界成熟的 `@formatjs/intl` 库构建,提供了强大而灵活的多语言支持能力,帮助开发者轻松实现应用的国际化和本地化。",
"main": "index.js",
"types": "index.d.ts",
Expand Down