@adaptivestone/framework 5.0.0-beta.35 → 5.0.0-beta.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -17,7 +17,7 @@ class I18n extends AbstractMiddleware {
|
|
|
17
17
|
lang = await this.detectLang(req);
|
|
18
18
|
}
|
|
19
19
|
const i18nService = await this.app.getI18nService();
|
|
20
|
-
req.appInfo.i18n = await i18nService.
|
|
20
|
+
req.appInfo.i18n = await i18nService.getI18nForLang(lang);
|
|
21
21
|
//@ts-expect-error we known thats a new one
|
|
22
22
|
req.i18n = new Proxy(req.appInfo.i18n, {
|
|
23
23
|
get: (target, prop) => {
|
|
@@ -42,7 +42,7 @@ class I18n extends AbstractMiddleware {
|
|
|
42
42
|
continue;
|
|
43
43
|
}
|
|
44
44
|
const i18nService = await this.app.getI18nService();
|
|
45
|
-
const i18nInstance = await i18nService.
|
|
45
|
+
const i18nInstance = await i18nService.getI18nBaseInstance();
|
|
46
46
|
if (i18nInstance.services.languageUtils.isSupportedCode(lng)) {
|
|
47
47
|
if (isUseShortCode) {
|
|
48
48
|
lang =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/I18n.ts"],"names":[],"mappings":"AAKA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAWzD,MAAM,IAAK,SAAQ,kBAAkB;IACnC,OAAO,GAAG,IAAI,CAAC;IAEf,iBAAiB,GAAG,EAAE,CAAC;IAEvB,YAAY,GAAS,EAAE,MAAgC;QACrD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;QACnE,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAC;IACxD,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,4CAA4C,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,IAAc,EAAE,IAAkB;QACxE,IAAI,IAAI,GAAG,EAAE,CAAC;QAEd,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/I18n.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@ export type TI18n = {
|
|
|
6
6
|
};
|
|
7
7
|
export declare class I18n extends Base {
|
|
8
8
|
#private;
|
|
9
|
-
|
|
9
|
+
getI18nForLang(lang?: string): Promise<{
|
|
10
10
|
t: TFunction;
|
|
11
11
|
language: string;
|
|
12
12
|
}>;
|
|
13
|
-
|
|
13
|
+
getI18nBaseInstance(): Promise<i18n>;
|
|
14
14
|
static get loggerGroup(): string;
|
|
15
15
|
}
|
|
@@ -6,7 +6,7 @@ export class I18n extends Base {
|
|
|
6
6
|
t: ((text) => text),
|
|
7
7
|
language: 'en',
|
|
8
8
|
};
|
|
9
|
-
async
|
|
9
|
+
async getI18nForLang(lang) {
|
|
10
10
|
const i18NConfig = this.app.getConfig('i18n');
|
|
11
11
|
if (!i18NConfig.enabled) {
|
|
12
12
|
return this.#i18nFallback;
|
|
@@ -16,14 +16,14 @@ export class I18n extends Base {
|
|
|
16
16
|
lang = i18NConfig.fallbackLng;
|
|
17
17
|
}
|
|
18
18
|
if (!this.#cache[lang]) {
|
|
19
|
-
this.#cache[lang] = (await this.
|
|
19
|
+
this.#cache[lang] = (await this.getI18nBaseInstance()).cloneInstance({
|
|
20
20
|
initAsync: false,
|
|
21
21
|
lng: lang,
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
return this.#cache[lang];
|
|
25
25
|
}
|
|
26
|
-
async
|
|
26
|
+
async getI18nBaseInstance() {
|
|
27
27
|
if (!this.#i18nBase) {
|
|
28
28
|
const [{ default: i18next }, { default: BackendFS }] = await Promise.all([
|
|
29
29
|
import('i18next'), // Speed optimisation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAIzC,MAAM,OAAO,IAAK,SAAQ,IAAI;IAC5B,MAAM,GAA4B,EAAE,CAAC;IAErC,SAAS,CAAQ;IAEjB,aAAa,GAAuC;QAClD,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAc;QAChC,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAIzC,MAAM,OAAO,IAAK,SAAQ,IAAI;IAC5B,MAAM,GAA4B,EAAE,CAAC;IAErC,SAAS,CAAQ;IAEjB,aAAa,GAAuC;QAClD,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAc;QAChC,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,KAAK,CAAC,cAAc,CAAC,IAAa;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;QACnE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,MAAM,EAAE,OAAO,CAClB,aAAa,IAAI,yDAAyD,UAAU,CAAC,WAAW,EAAE,CACnG,CAAC;YACF,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,aAAa,CAAC;gBACnE,SAAS,EAAE,KAAK;gBAChB,GAAG,EAAE,IAAI;aACV,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACvE,MAAM,CAAC,SAAS,CAAC,EAAE,qBAAqB;gBACxC,MAAM,CAAC,oBAAoB,CAAC,EAAE,qBAAqB;aACpD,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;YAEnE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;gBAC1B,OAAO,EAAE;oBACP,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,sBAAsB;oBACjE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,8BAA8B;iBACzE;gBACD,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,KAAK,EAAE,UAAU,CAAC,KAAK;aACxB,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|