ets-fe-ng-sdk 18.0.133 → 18.0.134
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/esm2022/lib/Services/translation.service.mjs +14 -12
- package/fesm2022/ets-fe-ng-sdk.mjs +12 -10
- package/fesm2022/ets-fe-ng-sdk.mjs.map +1 -1
- package/lib/Services/translation.service.d.ts +3 -3
- package/lib/Services/utility.service.d.ts +1 -1
- package/lib/Shared/components/btn/btn.component.d.ts +3 -3
- package/lib/Shared/components/index-comp-layout/index-comp-layout.component.d.ts +1 -1
- package/lib/Shared/components/info-dialog/info-dialog.component.d.ts +1 -1
- package/lib/Shared/components/table/table-https/table-https.component.d.ts +3 -3
- package/package.json +1 -1
|
@@ -6,12 +6,14 @@ import { ToastNotificationsService } from '@serene-dev/toast-notifications';
|
|
|
6
6
|
import * as i0 from "@angular/core";
|
|
7
7
|
import * as i1 from "./api.service";
|
|
8
8
|
import * as i2 from "./storage.service";
|
|
9
|
-
import * as i3 from "./cache/
|
|
9
|
+
import * as i3 from "./cache/cache.service";
|
|
10
10
|
export class TranslationService {
|
|
11
|
-
constructor(apiService, storageS,
|
|
11
|
+
constructor(apiService, storageS,
|
|
12
|
+
// public lCacheS: LocalCacheService,
|
|
13
|
+
cacheS) {
|
|
12
14
|
this.apiService = apiService;
|
|
13
15
|
this.storageS = storageS;
|
|
14
|
-
this.
|
|
16
|
+
this.cacheS = cacheS;
|
|
15
17
|
this.baseURL = environment.apiBaseUrl + '/rest/translation/';
|
|
16
18
|
this.translationRequestMatrix = [];
|
|
17
19
|
this.translationResponseMatrix = new BehaviorSubject({});
|
|
@@ -29,8 +31,8 @@ export class TranslationService {
|
|
|
29
31
|
res.next(HTMLString);
|
|
30
32
|
res.complete();
|
|
31
33
|
}
|
|
32
|
-
else if (this.
|
|
33
|
-
res.next(this.
|
|
34
|
+
else if (this.cacheS.has(cacheKey)) {
|
|
35
|
+
res.next(this.cacheS.getItem(cacheKey));
|
|
34
36
|
res.complete();
|
|
35
37
|
}
|
|
36
38
|
else {
|
|
@@ -43,7 +45,7 @@ export class TranslationService {
|
|
|
43
45
|
const transVal = r[id];
|
|
44
46
|
if (transVal) {
|
|
45
47
|
res.next(transVal);
|
|
46
|
-
this.
|
|
48
|
+
this.cacheS.setItem(cacheKey, transVal);
|
|
47
49
|
res.complete();
|
|
48
50
|
sub.unsubscribe();
|
|
49
51
|
}
|
|
@@ -70,12 +72,12 @@ export class TranslationService {
|
|
|
70
72
|
const route = this.baseURL + `language`;
|
|
71
73
|
if (!text)
|
|
72
74
|
resolve(null);
|
|
73
|
-
else if (this.
|
|
74
|
-
resolve(this.
|
|
75
|
+
else if (this.cacheS.has(route + '_' + text))
|
|
76
|
+
resolve(this.cacheS.getItem(route + '_' + text));
|
|
75
77
|
else
|
|
76
78
|
resolve(await this.apiService
|
|
77
79
|
.postString(route, text)
|
|
78
|
-
.pipe(tap((r) => this.
|
|
80
|
+
.pipe(tap((r) => this.cacheS.setItem(route + '_' + text, r)))
|
|
79
81
|
.toPromise());
|
|
80
82
|
});
|
|
81
83
|
};
|
|
@@ -147,7 +149,7 @@ export class TranslationService {
|
|
|
147
149
|
return this.detagger(r)[id];
|
|
148
150
|
}));
|
|
149
151
|
}
|
|
150
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, deps: [{ token: i1.ApiService }, { token: i2.ETSStorageService }, { token: i3.
|
|
152
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, deps: [{ token: i1.ApiService }, { token: i2.ETSStorageService }, { token: i3.CacheService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
151
153
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, providedIn: 'root' }); }
|
|
152
154
|
}
|
|
153
155
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, decorators: [{
|
|
@@ -155,5 +157,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImpor
|
|
|
155
157
|
args: [{
|
|
156
158
|
providedIn: 'root',
|
|
157
159
|
}]
|
|
158
|
-
}], ctorParameters: () => [{ type: i1.ApiService }, { type: i2.ETSStorageService }, { type: i3.
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"translation.service.js","sourceRoot":"","sources":["../../../../../projects/ets-fe-ng-sdk/src/lib/Services/translation.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, Injectable } from '@angular/core';\nimport { BehaviorSubject, Observable, Subscription, interval, lastValueFrom, of } from 'rxjs';\nimport { filter, map, tap } from 'rxjs/operators';\nimport { environment } from '../../environments/environment';\nimport { ELanguage } from '../Shared/models/index.model';\nimport { ApiService } from './api.service';\nimport { LocalCacheService } from './cache/local-cache.service';\nimport { ETSStorageService } from './storage.service';\nimport { ITranslatorConfig } from '../Shared/models/translator.model';\nimport { EVFunctions } from '../configs/base-functions';\nimport { ToastNotificationsService } from '@serene-dev/toast-notifications';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class TranslationService<TranslationGlossaryResponse = any> {\n  protected baseURL = environment.apiBaseUrl + '/rest/translation/';\n  protected readonly translationRequestMatrix: { id: string; text: string }[] = [];\n  protected translationResponseMatrix: BehaviorSubject<{ [id: string]: string }> =\n    new BehaviorSubject({});\n  readonly separator = '~~~';\n  name = 'glossary';\n  sourceLanguage: ELanguage;\n  targetLanguage: ELanguage;\n  transGlossary;\n  // readonly uS = inject(UtilityService);\n  protected intervalSub: Subscription;\n  public readonly toastNotificationService = inject(ToastNotificationsService);\n  constructor(\n    public apiService: ApiService,\n    public storageS: ETSStorageService,\n    public lCacheS: LocalCacheService,\n  ) {\n    this.toastNotificationService.labelPipe = (val) => {\n      return this.pipeTransformer(val, { noLoader: true });\n    };\n  }\n  pipeTransformer: (text: string | number, config?: ITranslatorConfig) => Observable<string> = (\n    text,\n  ) => of(text as string);\n  async startInterval() {\n    if (this.intervalSub && !this.intervalSub.closed) return;\n    const transGlossary = this.transGlossary || (await lastValueFrom(this.getGlossary()));\n    this.intervalSub = interval(400)\n      .pipe(\n        filter(() => this.translationRequestMatrix.length > 0),\n\n        tap(async () => {\n          const body = this.translationRequestMatrix.splice(0);\n\n          // debugger;\n          lastValueFrom(\n            this.apiService.postString(\n              this.baseURL +\n                (this.transGlossary?.code\n                  ? `language?glossaryCode=${this.transGlossary?.code}&sourceLang=${this.sourceLanguage}&targetLang=${this.targetLanguage}`\n                  : `language/${this.targetLanguage}`),\n              body.map((x) => this.tagger(x.id, x.text)).join(this.separator),\n            ),\n          )\n            .then((r) => {\n              this.translationResponseMatrix.next(this.detagger(r));\n            })\n            .catch((e) => {\n              console.error(e);\n            });\n        }),\n      )\n      .subscribe();\n  }\n  stopInterval() {\n    this.intervalSub?.unsubscribe();\n  }\n  protected tagger(id: string, str: string) {\n    return `<div id=\"${id}\">${str}</div>`;\n  }\n  getGlossary(\n    sourceLanguage: ELanguage = environment.sourceLanguage,\n    targetLanguage: ELanguage = environment.targetLanguage,\n  ) {\n    this.sourceLanguage = sourceLanguage || this.sourceLanguage;\n    this.targetLanguage = targetLanguage || this.targetLanguage;\n\n    return this.apiService.get<TranslationGlossaryResponse[]>(`${this.baseURL}glossary/`).pipe(\n      map((r: any[]) => {\n        // debugger;\n        const glossary = r?.find(\n          (x) =>\n            x.sourceLang == this.sourceLanguage &&\n            x.targetLang == this.targetLanguage &&\n            x.name == this.name,\n        );\n        return glossary ? glossary : null;\n      }),\n      map((glossary) => {\n        if (!glossary) return null;\n        this.transGlossary = environment.transGlossary = glossary;\n        this.storageS.saveItem(environment.transGlossaryKey, this.transGlossary);\n        return glossary;\n      }),\n    );\n  }\n  detagger(str: string) {\n    const items = str?.split(this.separator);\n    const resobj = {};\n    for (const str of items) {\n      resobj[str?.split('\"')[1]] = str?.split('>')[1]?.split('</div')[0];\n    }\n    return resobj;\n  }\n\n  translateOld(text: string) {\n    const id = 3232323;\n    const body = { [id]: text };\n    return this.apiService\n      .postString(\n        this.baseURL + `language/${environment.targetLanguage}`,\n        Object.keys(body)\n          .map((id) => this.tagger(id, body[id]))\n          .join(this.separator),\n      )\n      .pipe(\n        map((r) => {\n          return this.detagger(r)[id] as string;\n        }),\n      );\n  }\n\n  translateHTML = (\n    HTMLString: string,\n    sourceLanguage = this.sourceLanguage,\n    targetLanguage = this.targetLanguage,\n\n    config?: ITranslatorConfig,\n  ) => {\n    return new Observable<string>((res) => {\n      if (config?.debug) debugger;\n\n      const text = HTMLString?.trim(),\n        route = this.baseURL + `language`;\n      const cacheKey = route + '_' + targetLanguage + '_' + text;\n      if (!text) {\n        res.next(HTMLString);\n        res.complete();\n      } else if (this.lCacheS.has(cacheKey)) {\n        res.next(this.lCacheS.getItem<string>(cacheKey));\n        res.complete();\n      } else {\n        const id = this.idGenerator(text);\n        this.translationRequestMatrix.push({ id, text });\n        const sub: Subscription = this.translationResponseMatrix.subscribe({\n          next: (r) => {\n            if (config?.debug) debugger;\n            const transVal = r[id];\n            if (transVal) {\n              res.next(transVal);\n              this.lCacheS.setItem(cacheKey, transVal);\n              res.complete();\n              sub.unsubscribe();\n            }\n          },\n          error: (e) => {\n            res.error(e);\n          },\n        });\n      }\n    });\n  };\n\n  idGeneratorKey = {\n    ' ': '~',\n  };\n  idGenerator = (text: string): string => {\n    let res: string = '';\n    for (const char of text) res += this.idGeneratorKey[char] || char;\n    return res;\n  };\n  plainTranslate = (\n    text: string,\n    sourceLanguage = environment.sourceLanguage,\n    targetLanguage = environment.targetLanguage,\n  ) => {\n    return new Promise<string>(async (resolve) => {\n      text = text?.trim();\n      const route = this.baseURL + `language`;\n\n      if (!text) resolve(null);\n      else if (this.lCacheS.has(route + '_' + text))\n        resolve(this.lCacheS.getItem<string>(route + '_' + text));\n      else\n        resolve(\n          await this.apiService\n            .postString(route, text)\n            .pipe(tap((r) => this.lCacheS.setItem(route + '_' + text, r)))\n            .toPromise(),\n        );\n    });\n  };\n  translateHTMLPromise = (\n    text: string,\n    sourceLanguage = environment.sourceLanguage,\n    targetLanguage = environment.targetLanguage,\n    config?: ITranslatorConfig,\n  ) => this.translateHTML(text, sourceLanguage, targetLanguage, config)?.toPromise();\n}\n"]}
|
|
160
|
+
}], ctorParameters: () => [{ type: i1.ApiService }, { type: i2.ETSStorageService }, { type: i3.CacheService }] });
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"translation.service.js","sourceRoot":"","sources":["../../../../../projects/ets-fe-ng-sdk/src/lib/Services/translation.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, Injectable } from '@angular/core';\nimport { BehaviorSubject, Observable, Subscription, interval, lastValueFrom, of } from 'rxjs';\nimport { filter, map, tap } from 'rxjs/operators';\nimport { environment } from '../../environments/environment';\nimport { ELanguage } from '../Shared/models/index.model';\nimport { ApiService } from './api.service';\nimport { LocalCacheService } from './cache/local-cache.service';\nimport { ETSStorageService } from './storage.service';\nimport { ITranslatorConfig } from '../Shared/models/translator.model';\nimport { EVFunctions } from '../configs/base-functions';\nimport { ToastNotificationsService } from '@serene-dev/toast-notifications';\nimport { CacheService } from './cache/cache.service';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class TranslationService<TranslationGlossaryResponse = any> {\n  protected baseURL = environment.apiBaseUrl + '/rest/translation/';\n  protected readonly translationRequestMatrix: { id: string; text: string }[] = [];\n  protected translationResponseMatrix: BehaviorSubject<{ [id: string]: string }> =\n    new BehaviorSubject({});\n  readonly separator = '~~~';\n  name = 'glossary';\n  sourceLanguage: ELanguage;\n  targetLanguage: ELanguage;\n  transGlossary;\n  // readonly uS = inject(UtilityService);\n  protected intervalSub: Subscription;\n  public readonly toastNotificationService = inject(ToastNotificationsService);\n  constructor(\n    public apiService: ApiService,\n    public storageS: ETSStorageService,\n    // public lCacheS: LocalCacheService,\n    public cacheS: CacheService,\n  ) {\n    this.toastNotificationService.labelPipe = (val) => {\n      return this.pipeTransformer(val, { noLoader: true });\n    };\n  }\n  pipeTransformer: (text: string | number, config?: ITranslatorConfig) => Observable<string> = (\n    text,\n  ) => of(text as string);\n  async startInterval() {\n    if (this.intervalSub && !this.intervalSub.closed) return;\n    const transGlossary = this.transGlossary || (await lastValueFrom(this.getGlossary()));\n    this.intervalSub = interval(400)\n      .pipe(\n        filter(() => this.translationRequestMatrix.length > 0),\n\n        tap(async () => {\n          const body = this.translationRequestMatrix.splice(0);\n\n          // debugger;\n          lastValueFrom(\n            this.apiService.postString(\n              this.baseURL +\n                (this.transGlossary?.code\n                  ? `language?glossaryCode=${this.transGlossary?.code}&sourceLang=${this.sourceLanguage}&targetLang=${this.targetLanguage}`\n                  : `language/${this.targetLanguage}`),\n              body.map((x) => this.tagger(x.id, x.text)).join(this.separator),\n            ),\n          )\n            .then((r) => {\n              this.translationResponseMatrix.next(this.detagger(r));\n            })\n            .catch((e) => {\n              console.error(e);\n            });\n        }),\n      )\n      .subscribe();\n  }\n  stopInterval() {\n    this.intervalSub?.unsubscribe();\n  }\n  protected tagger(id: string, str: string) {\n    return `<div id=\"${id}\">${str}</div>`;\n  }\n  getGlossary(\n    sourceLanguage: ELanguage = environment.sourceLanguage,\n    targetLanguage: ELanguage = environment.targetLanguage,\n  ) {\n    this.sourceLanguage = sourceLanguage || this.sourceLanguage;\n    this.targetLanguage = targetLanguage || this.targetLanguage;\n\n    return this.apiService.get<TranslationGlossaryResponse[]>(`${this.baseURL}glossary/`).pipe(\n      map((r: any[]) => {\n        // debugger;\n        const glossary = r?.find(\n          (x) =>\n            x.sourceLang == this.sourceLanguage &&\n            x.targetLang == this.targetLanguage &&\n            x.name == this.name,\n        );\n        return glossary ? glossary : null;\n      }),\n      map((glossary) => {\n        if (!glossary) return null;\n        this.transGlossary = environment.transGlossary = glossary;\n        this.storageS.saveItem(environment.transGlossaryKey, this.transGlossary);\n        return glossary;\n      }),\n    );\n  }\n  detagger(str: string) {\n    const items = str?.split(this.separator);\n    const resobj = {};\n    for (const str of items) {\n      resobj[str?.split('\"')[1]] = str?.split('>')[1]?.split('</div')[0];\n    }\n    return resobj;\n  }\n\n  translateOld(text: string) {\n    const id = 3232323;\n    const body = { [id]: text };\n    return this.apiService\n      .postString(\n        this.baseURL + `language/${environment.targetLanguage}`,\n        Object.keys(body)\n          .map((id) => this.tagger(id, body[id]))\n          .join(this.separator),\n      )\n      .pipe(\n        map((r) => {\n          return this.detagger(r)[id] as string;\n        }),\n      );\n  }\n\n  translateHTML = (\n    HTMLString: string,\n    sourceLanguage = this.sourceLanguage,\n    targetLanguage = this.targetLanguage,\n\n    config?: ITranslatorConfig,\n  ) => {\n    return new Observable<string>((res) => {\n      if (config?.debug) debugger;\n\n      const text = HTMLString?.trim(),\n        route = this.baseURL + `language`;\n      const cacheKey = route + '_' + targetLanguage + '_' + text;\n      if (!text) {\n        res.next(HTMLString);\n        res.complete();\n      } else if (this.cacheS.has(cacheKey)) {\n        res.next(this.cacheS.getItem<string>(cacheKey));\n        res.complete();\n      } else {\n        const id = this.idGenerator(text);\n        this.translationRequestMatrix.push({ id, text });\n        const sub: Subscription = this.translationResponseMatrix.subscribe({\n          next: (r) => {\n            if (config?.debug) debugger;\n            const transVal = r[id];\n            if (transVal) {\n              res.next(transVal);\n              this.cacheS.setItem(cacheKey, transVal);\n              res.complete();\n              sub.unsubscribe();\n            }\n          },\n          error: (e) => {\n            res.error(e);\n          },\n        });\n      }\n    });\n  };\n\n  idGeneratorKey = {\n    ' ': '~',\n  };\n  idGenerator = (text: string): string => {\n    let res: string = '';\n    for (const char of text) res += this.idGeneratorKey[char] || char;\n    return res;\n  };\n  plainTranslate = (\n    text: string,\n    sourceLanguage = environment.sourceLanguage,\n    targetLanguage = environment.targetLanguage,\n  ) => {\n    return new Promise<string>(async (resolve) => {\n      text = text?.trim();\n      const route = this.baseURL + `language`;\n\n      if (!text) resolve(null);\n      else if (this.cacheS.has(route + '_' + text))\n        resolve(this.cacheS.getItem<string>(route + '_' + text));\n      else\n        resolve(\n          await this.apiService\n            .postString(route, text)\n            .pipe(tap((r) => this.cacheS.setItem(route + '_' + text, r)))\n            .toPromise(),\n        );\n    });\n  };\n  translateHTMLPromise = (\n    text: string,\n    sourceLanguage = environment.sourceLanguage,\n    targetLanguage = environment.targetLanguage,\n    config?: ITranslatorConfig,\n  ) => this.translateHTML(text, sourceLanguage, targetLanguage, config)?.toPromise();\n}\n"]}
|
|
@@ -3480,10 +3480,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImpor
|
|
|
3480
3480
|
}], ctorParameters: () => [] });
|
|
3481
3481
|
|
|
3482
3482
|
class TranslationService {
|
|
3483
|
-
constructor(apiService, storageS,
|
|
3483
|
+
constructor(apiService, storageS,
|
|
3484
|
+
// public lCacheS: LocalCacheService,
|
|
3485
|
+
cacheS) {
|
|
3484
3486
|
this.apiService = apiService;
|
|
3485
3487
|
this.storageS = storageS;
|
|
3486
|
-
this.
|
|
3488
|
+
this.cacheS = cacheS;
|
|
3487
3489
|
this.baseURL = environment.apiBaseUrl + '/rest/translation/';
|
|
3488
3490
|
this.translationRequestMatrix = [];
|
|
3489
3491
|
this.translationResponseMatrix = new BehaviorSubject({});
|
|
@@ -3501,8 +3503,8 @@ class TranslationService {
|
|
|
3501
3503
|
res.next(HTMLString);
|
|
3502
3504
|
res.complete();
|
|
3503
3505
|
}
|
|
3504
|
-
else if (this.
|
|
3505
|
-
res.next(this.
|
|
3506
|
+
else if (this.cacheS.has(cacheKey)) {
|
|
3507
|
+
res.next(this.cacheS.getItem(cacheKey));
|
|
3506
3508
|
res.complete();
|
|
3507
3509
|
}
|
|
3508
3510
|
else {
|
|
@@ -3515,7 +3517,7 @@ class TranslationService {
|
|
|
3515
3517
|
const transVal = r[id];
|
|
3516
3518
|
if (transVal) {
|
|
3517
3519
|
res.next(transVal);
|
|
3518
|
-
this.
|
|
3520
|
+
this.cacheS.setItem(cacheKey, transVal);
|
|
3519
3521
|
res.complete();
|
|
3520
3522
|
sub.unsubscribe();
|
|
3521
3523
|
}
|
|
@@ -3542,12 +3544,12 @@ class TranslationService {
|
|
|
3542
3544
|
const route = this.baseURL + `language`;
|
|
3543
3545
|
if (!text)
|
|
3544
3546
|
resolve(null);
|
|
3545
|
-
else if (this.
|
|
3546
|
-
resolve(this.
|
|
3547
|
+
else if (this.cacheS.has(route + '_' + text))
|
|
3548
|
+
resolve(this.cacheS.getItem(route + '_' + text));
|
|
3547
3549
|
else
|
|
3548
3550
|
resolve(await this.apiService
|
|
3549
3551
|
.postString(route, text)
|
|
3550
|
-
.pipe(tap((r) => this.
|
|
3552
|
+
.pipe(tap((r) => this.cacheS.setItem(route + '_' + text, r)))
|
|
3551
3553
|
.toPromise());
|
|
3552
3554
|
});
|
|
3553
3555
|
};
|
|
@@ -3619,7 +3621,7 @@ class TranslationService {
|
|
|
3619
3621
|
return this.detagger(r)[id];
|
|
3620
3622
|
}));
|
|
3621
3623
|
}
|
|
3622
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, deps: [{ token: ApiService }, { token: ETSStorageService }, { token:
|
|
3624
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, deps: [{ token: ApiService }, { token: ETSStorageService }, { token: CacheService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
3623
3625
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, providedIn: 'root' }); }
|
|
3624
3626
|
}
|
|
3625
3627
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: TranslationService, decorators: [{
|
|
@@ -3627,7 +3629,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImpor
|
|
|
3627
3629
|
args: [{
|
|
3628
3630
|
providedIn: 'root',
|
|
3629
3631
|
}]
|
|
3630
|
-
}], ctorParameters: () => [{ type: ApiService }, { type: ETSStorageService }, { type:
|
|
3632
|
+
}], ctorParameters: () => [{ type: ApiService }, { type: ETSStorageService }, { type: CacheService }] });
|
|
3631
3633
|
|
|
3632
3634
|
class SDKTranslatePipe {
|
|
3633
3635
|
transform(text, config) {
|