@acorex/core 5.4.0 → 5.5.0
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/esm2020/lib/translation/translator.mjs +4 -3
- package/esm2020/lib/translation/translator.pipe.mjs +3 -3
- package/fesm2015/acorex-core.mjs +5 -4
- package/fesm2015/acorex-core.mjs.map +1 -1
- package/fesm2020/acorex-core.mjs +5 -4
- package/fesm2020/acorex-core.mjs.map +1 -1
- package/lib/translation/translator.d.ts +1 -1
- package/lib/translation/translator.pipe.d.ts +1 -1
- package/package.json +1 -1
|
@@ -17,8 +17,9 @@ export class AXTranslator {
|
|
|
17
17
|
static use(lang) {
|
|
18
18
|
AXTranslator.lang = lang;
|
|
19
19
|
}
|
|
20
|
-
static get(key,
|
|
21
|
-
lang =
|
|
20
|
+
static get(key, arg1, arg2) {
|
|
21
|
+
const lang = arg1 && typeof arg1 == 'string' ? arg1 : AXTranslator.lang;
|
|
22
|
+
const params = arg1 && typeof arg1 == 'object' ? arg1 : arg2;
|
|
22
23
|
let result = _.get(AXTranslator[`__data__${lang}`], key, key);
|
|
23
24
|
const vars = typeof (result) == 'string' ? result?.match(this._varsRegx) : [];
|
|
24
25
|
if (vars?.length) {
|
|
@@ -39,4 +40,4 @@ AXTranslator.lang = 'en';
|
|
|
39
40
|
AXTranslator.dataChangeSubject = new Subject();
|
|
40
41
|
AXTranslator._varsRegx = /((\$\{[a-zA-Z_0-9\.]+\})+)/gm;
|
|
41
42
|
AXTranslator._varNameRegx = /[a-zA-Z_0-9\.]+/gm;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Fjb3JleC9jb3JlL3NyYy9saWIvdHJhbnNsYXRpb24vdHJhbnNsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFjLE1BQU0sTUFBTSxDQUFDO0FBQzNDLE9BQU8sS0FBSyxNQUFNLGlCQUFpQixDQUFDO0FBQ3BDLE9BQU8sQ0FBQyxNQUFNLFFBQVEsQ0FBQztBQUV2QixXQUFXO0FBQ1gsTUFBTSxPQUFPLFlBQVk7SUFPckIsTUFBTSxLQUFLLFFBQVE7UUFDZixPQUFPLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUN6RCxDQUFDO0lBRU0sTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFZLEVBQUUsS0FBVTtRQUN2QyxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRTtZQUMzQixJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsSUFBSSxFQUFFLENBQUMsRUFBRTtnQkFDbEMsWUFBWSxDQUFDLFdBQVcsSUFBSSxFQUFFLENBQUMsR0FBRyxFQUFFLENBQUM7YUFDeEM7WUFDRCxZQUFZLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDO1NBQ25GO0lBQ0wsQ0FBQztJQUVNLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBWTtRQUMxQixZQUFZLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUM3QixDQUFDO0lBRU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFXLEVBQUUsSUFBc0IsRUFBRSxJQUFhO1FBRWhFLE1BQU0sSUFBSSxHQUFHLElBQUksSUFBSSxPQUFPLElBQUksSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQztRQUN4RSxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksT0FBTyxJQUFJLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUM3RCxJQUFJLE1BQU0sR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxXQUFXLElBQUksRUFBRSxDQUFDLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQzlELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDOUUsSUFBSSxJQUFJLEVBQUUsTUFBTSxFQUFFO1lBQ2QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDYixNQUFNLE1BQU0sR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ3pGLElBQUksTUFBTSxFQUFFO29CQUNSLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO29CQUMxRCxJQUFJLENBQUMsRUFBRTt3QkFDSCxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7cUJBQ2pDO2lCQUNKO1lBQ0wsQ0FBQyxDQUFDLENBQUE7U0FDTDtRQUNELE9BQU8sT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLFFBQVEsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3pFLENBQUM7O0FBekNjLGlCQUFJLEdBQVcsSUFBSSxDQUFDO0FBQ3BCLDhCQUFpQixHQUFHLElBQUksT0FBTyxFQUFPLENBQUM7QUFDdkMsc0JBQVMsR0FBRyw4QkFBOEIsQ0FBQztBQUMzQyx5QkFBWSxHQUFHLG1CQUFtQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3ViamVjdCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgbWVyZ2UgZnJvbSAnbG9kYXNoLWVzL21lcmdlJztcclxuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcclxuXHJcbi8vIEBkeW5hbWljXHJcbmV4cG9ydCBjbGFzcyBBWFRyYW5zbGF0b3Ige1xyXG4gICAgcHJpdmF0ZSBzdGF0aWMgbGFuZzogc3RyaW5nID0gJ2VuJztcclxuICAgIHByaXZhdGUgc3RhdGljIGRhdGFDaGFuZ2VTdWJqZWN0ID0gbmV3IFN1YmplY3Q8YW55PigpO1xyXG4gICAgcHJpdmF0ZSBzdGF0aWMgX3ZhcnNSZWd4ID0gLygoXFwkXFx7W2EtekEtWl8wLTlcXC5dK1xcfSkrKS9nbTtcclxuICAgIHByaXZhdGUgc3RhdGljIF92YXJOYW1lUmVneCA9IC9bYS16QS1aXzAtOVxcLl0rL2dtO1xyXG5cclxuXHJcbiAgICBzdGF0aWMgZ2V0IG9uQ2hhbmdlKCk6IE9ic2VydmFibGU8YW55PiB7XHJcbiAgICAgICAgcmV0dXJuIEFYVHJhbnNsYXRvci5kYXRhQ2hhbmdlU3ViamVjdC5hc09ic2VydmFibGUoKTtcclxuICAgIH1cclxuXHJcbiAgICBwdWJsaWMgc3RhdGljIGxvYWQobGFuZzogc3RyaW5nLCB2YWx1ZTogYW55KSB7XHJcbiAgICAgICAgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gJ29iamVjdCcpIHtcclxuICAgICAgICAgICAgaWYgKCFBWFRyYW5zbGF0b3JbYF9fZGF0YV9fJHtsYW5nfWBdKSB7XHJcbiAgICAgICAgICAgICAgICBBWFRyYW5zbGF0b3JbYF9fZGF0YV9fJHtsYW5nfWBdID0ge307XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgQVhUcmFuc2xhdG9yW2BfX2RhdGFfXyR7bGFuZ31gXSA9IG1lcmdlKEFYVHJhbnNsYXRvcltgX19kYXRhX18ke2xhbmd9YF0sIHZhbHVlKTtcclxuICAgICAgICB9XHJcbiAgICB9XHJcblxyXG4gICAgcHVibGljIHN0YXRpYyB1c2UobGFuZzogc3RyaW5nKSB7XHJcbiAgICAgICAgQVhUcmFuc2xhdG9yLmxhbmcgPSBsYW5nO1xyXG4gICAgfVxyXG5cclxuICAgIHB1YmxpYyBzdGF0aWMgZ2V0KGtleTogc3RyaW5nLCBhcmcxPzogb2JqZWN0IHwgc3RyaW5nLCBhcmcyPzogb2JqZWN0KTogc3RyaW5nIHtcclxuXHJcbiAgICAgICAgY29uc3QgbGFuZyA9IGFyZzEgJiYgdHlwZW9mIGFyZzEgPT0gJ3N0cmluZycgPyBhcmcxIDogQVhUcmFuc2xhdG9yLmxhbmc7XHJcbiAgICAgICAgY29uc3QgcGFyYW1zID0gYXJnMSAmJiB0eXBlb2YgYXJnMSA9PSAnb2JqZWN0JyA/IGFyZzEgOiBhcmcyO1xyXG4gICAgICAgIGxldCByZXN1bHQgPSBfLmdldChBWFRyYW5zbGF0b3JbYF9fZGF0YV9fJHtsYW5nfWBdLCBrZXksIGtleSk7XHJcbiAgICAgICAgY29uc3QgdmFycyA9IHR5cGVvZiAocmVzdWx0KSA9PSAnc3RyaW5nJyA/IHJlc3VsdD8ubWF0Y2godGhpcy5fdmFyc1JlZ3gpIDogW107XHJcbiAgICAgICAgaWYgKHZhcnM/Lmxlbmd0aCkge1xyXG4gICAgICAgICAgICB2YXJzLmZvckVhY2godiA9PiB7XHJcbiAgICAgICAgICAgICAgICBjb25zdCB2YXJLZXkgPSB2Lm1hdGNoKHRoaXMuX3Zhck5hbWVSZWd4KT8ubGVuZ3RoID8gdi5tYXRjaCh0aGlzLl92YXJOYW1lUmVneClbMF0gOiBudWxsO1xyXG4gICAgICAgICAgICAgICAgaWYgKHZhcktleSkge1xyXG4gICAgICAgICAgICAgICAgICAgIGNvbnN0IHAgPSBfLmdldChwYXJhbXMsIHZhcktleSkgfHwgdGhpcy5nZXQodmFyS2V5LCBsYW5nKTtcclxuICAgICAgICAgICAgICAgICAgICBpZiAocCkge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSByZXN1bHQucmVwbGFjZSh2LCBwKTtcclxuICAgICAgICAgICAgICAgICAgICB9XHJcbiAgICAgICAgICAgICAgICB9XHJcbiAgICAgICAgICAgIH0pXHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiB0eXBlb2YgKHJlc3VsdCkgPT0gJ3N0cmluZycgPyByZXN1bHQgOiBKU09OLnN0cmluZ2lmeShyZXN1bHQpO1xyXG4gICAgfVxyXG59Il19
|
|
@@ -2,8 +2,8 @@ import { Pipe } from '@angular/core';
|
|
|
2
2
|
import { AXTranslator } from './translator';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
export class AXTranslatorPipe {
|
|
5
|
-
transform(value,
|
|
6
|
-
return AXTranslator.get(value,
|
|
5
|
+
transform(value, arg1, arg2) {
|
|
6
|
+
return AXTranslator.get(value, arg1, arg2);
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
9
|
AXTranslatorPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: AXTranslatorPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
|
|
@@ -12,4 +12,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.9", ngImpor
|
|
|
12
12
|
type: Pipe,
|
|
13
13
|
args: [{ name: 'trans', pure: true }]
|
|
14
14
|
}] });
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRvci5waXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYWNvcmV4L2NvcmUvc3JjL2xpYi90cmFuc2xhdGlvbi90cmFuc2xhdG9yLnBpcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBaUIsTUFBTSxlQUFlLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGNBQWMsQ0FBQzs7QUFHNUMsTUFBTSxPQUFPLGdCQUFnQjtJQUN6QixTQUFTLENBQUMsS0FBYSxFQUFFLElBQXNCLEVBQUUsSUFBYTtRQUMxRCxPQUFPLFlBQVksQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUMvQyxDQUFDOzs2R0FIUSxnQkFBZ0I7MkdBQWhCLGdCQUFnQjsyRkFBaEIsZ0JBQWdCO2tCQUQ1QixJQUFJO21CQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUGlwZSwgUGlwZVRyYW5zZm9ybSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBBWFRyYW5zbGF0b3IgfSBmcm9tICcuL3RyYW5zbGF0b3InO1xyXG5cclxuQFBpcGUoeyBuYW1lOiAndHJhbnMnLCBwdXJlOiB0cnVlIH0pXHJcbmV4cG9ydCBjbGFzcyBBWFRyYW5zbGF0b3JQaXBlIGltcGxlbWVudHMgUGlwZVRyYW5zZm9ybSB7XHJcbiAgICB0cmFuc2Zvcm0odmFsdWU6IHN0cmluZywgYXJnMT86IG9iamVjdCB8IHN0cmluZywgYXJnMj86IG9iamVjdCk6IHN0cmluZyB7XHJcbiAgICAgICAgcmV0dXJuIEFYVHJhbnNsYXRvci5nZXQodmFsdWUsIGFyZzEsIGFyZzIpO1xyXG4gICAgfVxyXG59XHJcbiJdfQ==
|
package/fesm2015/acorex-core.mjs
CHANGED
|
@@ -1187,8 +1187,9 @@ class AXTranslator {
|
|
|
1187
1187
|
static use(lang) {
|
|
1188
1188
|
AXTranslator.lang = lang;
|
|
1189
1189
|
}
|
|
1190
|
-
static get(key,
|
|
1191
|
-
lang =
|
|
1190
|
+
static get(key, arg1, arg2) {
|
|
1191
|
+
const lang = arg1 && typeof arg1 == 'string' ? arg1 : AXTranslator.lang;
|
|
1192
|
+
const params = arg1 && typeof arg1 == 'object' ? arg1 : arg2;
|
|
1192
1193
|
let result = _.get(AXTranslator[`__data__${lang}`], key, key);
|
|
1193
1194
|
const vars = typeof (result) == 'string' ? result === null || result === void 0 ? void 0 : result.match(this._varsRegx) : [];
|
|
1194
1195
|
if (vars === null || vars === void 0 ? void 0 : vars.length) {
|
|
@@ -1212,8 +1213,8 @@ AXTranslator._varsRegx = /((\$\{[a-zA-Z_0-9\.]+\})+)/gm;
|
|
|
1212
1213
|
AXTranslator._varNameRegx = /[a-zA-Z_0-9\.]+/gm;
|
|
1213
1214
|
|
|
1214
1215
|
class AXTranslatorPipe {
|
|
1215
|
-
transform(value,
|
|
1216
|
-
return AXTranslator.get(value,
|
|
1216
|
+
transform(value, arg1, arg2) {
|
|
1217
|
+
return AXTranslator.get(value, arg1, arg2);
|
|
1217
1218
|
}
|
|
1218
1219
|
}
|
|
1219
1220
|
AXTranslatorPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: AXTranslatorPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
|