@osovitny/anatoly 3.16.10 → 3.16.12
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/core/localization/localization.service.mjs +10 -5
- package/esm2022/lib/core/localization/settings.module.mjs +3 -3
- package/fesm2022/osovitny-anatoly.mjs +11 -6
- package/fesm2022/osovitny-anatoly.mjs.map +1 -1
- package/lib/core/localization/localization.service.d.ts +2 -1
- package/package.json +1 -1
|
@@ -28,10 +28,13 @@ import * as i1 from "@ngx-translate/core";
|
|
|
28
28
|
export class LocalizationService {
|
|
29
29
|
translate;
|
|
30
30
|
dateFnsLocale;
|
|
31
|
+
//i10n
|
|
31
32
|
supportedLanguages = ['en', 'ru', 'es'];
|
|
33
|
+
defaultLanguage = 'en';
|
|
32
34
|
constructor(translate) {
|
|
33
35
|
this.translate = translate;
|
|
34
36
|
this.setSupportedLanguages(this.supportedLanguages);
|
|
37
|
+
this.setDefaultLanguage(this.defaultLanguage);
|
|
35
38
|
}
|
|
36
39
|
format(str, args) {
|
|
37
40
|
return str.replace(/{(\d+)}/g, function (match, number) {
|
|
@@ -41,11 +44,13 @@ export class LocalizationService {
|
|
|
41
44
|
});
|
|
42
45
|
}
|
|
43
46
|
;
|
|
44
|
-
|
|
45
|
-
|
|
47
|
+
configureSettings(translate) {
|
|
48
|
+
//i10n
|
|
49
|
+
const browserLang = translate.getBrowserLang();
|
|
50
|
+
const lang = browserLang.match(/en|ru|es/) ? browserLang : this.defaultLanguage;
|
|
51
|
+
//dates
|
|
46
52
|
this.dateFnsLocale = { locale: enUS };
|
|
47
|
-
|
|
48
|
-
return languageToSet;
|
|
53
|
+
return lang;
|
|
49
54
|
}
|
|
50
55
|
getBrowserLanguage() {
|
|
51
56
|
return this.translate.getBrowserLang();
|
|
@@ -183,4 +188,4 @@ export class LocalizationService {
|
|
|
183
188
|
providedIn: 'root'
|
|
184
189
|
}]
|
|
185
190
|
}], function () { return [{ type: i1.TranslateService }]; }, null); })();
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"localization.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/localization/localization.service.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny vadim@osovitny.com\r\n    Anatoly Osovitny anatoly@osovitny.com\r\n\r\n  Created:\r\n    05 May 2020\r\n\r\n  Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n//Node\r\nimport { Injectable } from '@angular/core';\r\nimport { TranslateService } from '@ngx-translate/core';\r\n\r\n//Date fns\r\nimport { format, isValid, formatDistanceToNow, formatDistance } from 'date-fns';\r\nimport { utcToZonedTime } from 'date-fns-tz';\r\n\r\n// VadimOS: IE11-fix. DON'T change next imports!\r\n// Reason: https://github.com/date-fns/date-fns/issues/666\r\nimport enUS from 'date-fns/locale/en-US';\r\n\r\n//App\r\nimport { Convert } from '../converts/convert';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class LocalizationService {\r\n  dateFnsLocale: any;\r\n  supportedLanguages: any = ['en', 'ru', 'es'];\r\n\r\n  constructor(private translate: TranslateService) {\r\n    this.setSupportedLanguages(this.supportedLanguages);\r\n  }\r\n\r\n  private format(str: string, args) {\r\n    return str.replace(/{(\\d+)}/g, function (match, number) {\r\n      return typeof args[number] != 'undefined'\r\n        ? args[number]\r\n        : match\r\n        ;\r\n    });\r\n  };\r\n\r\n  configureTranslationSettings(translate: TranslateService): string {\r\n    const languageToSet = 'en';\r\n    this.dateFnsLocale = { locale: enUS };\r\n\r\n    translate.setDefaultLang(languageToSet);\r\n    return languageToSet;\r\n  }\r\n\r\n  getBrowserLanguage(): string {\r\n    return this.translate.getBrowserLang();\r\n  }\r\n\r\n  getDatefnsLocale(): any {\r\n    let dfnLocale: any;\r\n\r\n    switch (this.getBrowserLanguage()) {\r\n      case 'en':\r\n        dfnLocale = { locale: enUS };\r\n        break;\r\n\r\n      default:\r\n        dfnLocale = { locale: enUS };\r\n    }\r\n\r\n    return dfnLocale;\r\n  }\r\n\r\n  setDefaultLanguage(lang: string): void {\r\n    this.translate.setDefaultLang(lang);\r\n  }\r\n\r\n  setSupportedLanguages(languages: string[]): void {\r\n    this.translate.addLangs(languages);\r\n  }\r\n\r\n  updateLanguage(language: string): void {\r\n    this.translate.use(language);\r\n  }\r\n\r\n  getLocalizedValue(key: string, params?: any[]): string {\r\n    const value = this.translate.instant(key);\r\n\r\n    if (!params || params.length === 0) {\r\n      return value;\r\n    }\r\n\r\n    return this.format(value, params);\r\n  }\r\n\r\n  getLocalizedDate(key: string): string {\r\n    if (isValid(new Date(key))) {\r\n      return format(new Date(key), 'dd.MM.yyyy', this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  getLocalizedDateTime(key: string) {\r\n    let dateValue = new Date(key);\r\n    if (isValid(dateValue)) {\r\n      let localDate = Convert.toLocalizedDateTime(dateValue);\r\n      return format(localDate, 'dd.MM.yyyy HH:mm', this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  getLocalizedDistanceInWords(endedDate: string, startedDate: string): string {\r\n    if (isValid(new Date(endedDate)) && isValid(new Date(startedDate))) {\r\n      return formatDistance(new Date(endedDate), new Date(startedDate), this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  getLocalizedDistanceToNowInWords(date: string): string {\r\n    if (isValid(new Date(date))) {\r\n      return formatDistanceToNow(new Date(date), this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  //UTC Operations --------------------------------------------------------------\r\n  getUTCToLocalizedDate(key: string) {\r\n    let browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;\r\n\r\n    if (key) {\r\n      if (key.indexOf(\"T\") == -1) {\r\n        key = key.replace(\" \", \"T\");\r\n      }\r\n      if (key.indexOf(\"Z\") == -1) {\r\n        key = key + \"Z\";\r\n      }\r\n    }\r\n\r\n    if (browserTimeZone) {\r\n      let localDateTime = utcToZonedTime(key, browserTimeZone);\r\n      return format(localDateTime, 'dd.MM.yyyy', this.dateFnsLocale);\r\n    }\r\n    else {\r\n      return format(new Date(key), 'dd.MM.yyyy', this.dateFnsLocale);\r\n    }\r\n  }\r\n\r\n  getUTCToLocalizedDateTime(key: string) {\r\n    let browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;\r\n\r\n    if (key) {\r\n      if (key.indexOf(\"T\") == -1) {\r\n        key = key.replace(\" \", \"T\");\r\n      }\r\n      if (key.indexOf(\"Z\") == -1) {\r\n        key = key + \"Z\";\r\n      }\r\n    }\r\n\r\n    if (browserTimeZone) {\r\n      let localDateTime = utcToZonedTime(key, browserTimeZone);\r\n      return format(localDateTime, 'dd.MM.yyyy HH:mm', this.dateFnsLocale);\r\n    }\r\n    else {\r\n      return format(new Date(key), 'dd.MM.yyyy HH:mm', this.dateFnsLocale);\r\n    }\r\n  }\r\n\r\n  //https://date-fns.org/v1.30.1/docs/distanceInWords\r\n  getUTCToLocalizedDistanceToNowInWords(date: string): string {\r\n    date = this.safeUtcToZonedTime(date);\r\n\r\n    if (isValid(new Date(date))) {\r\n      return formatDistanceToNow(new Date(date), this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n\r\n  safeUtcToZonedTime(date): string {\r\n    let result = date;\r\n\r\n    try\r\n    {\r\n      if (date) {\r\n        if (date.indexOf(\"T\") == -1) {\r\n          date = date.replace(\" \", \"T\");\r\n        }\r\n\r\n        if (date.indexOf(\"Z\") == -1) {\r\n          date = date + \"Z\";\r\n        }\r\n      }\r\n\r\n      let browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;\r\n      if (browserTimeZone) {\r\n        result = utcToZonedTime(date, browserTimeZone).toString();\r\n      }\r\n      else {\r\n        result = new Date(date).toString();\r\n      }\r\n    }\r\n    catch\r\n    {\r\n      if (date) {\r\n        console.log(\"UTC to Local conversion failed for :\" + date.toString())\r\n      }\r\n    }\r\n\r\n    return result;\r\n  }\r\n}\r\n\r\n"]}
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"localization.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/localization/localization.service.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny vadim@osovitny.com\r\n    Anatoly Osovitny anatoly@osovitny.com\r\n\r\n  Created:\r\n    05 May 2020\r\n\r\n  Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n//Node\r\nimport { Injectable } from '@angular/core';\r\nimport { TranslateService } from '@ngx-translate/core';\r\n\r\n//Date fns\r\nimport { format, isValid, formatDistanceToNow, formatDistance } from 'date-fns';\r\nimport { utcToZonedTime } from 'date-fns-tz';\r\n\r\n// VadimOS: IE11-fix. DON'T change next imports!\r\n// Reason: https://github.com/date-fns/date-fns/issues/666\r\nimport enUS from 'date-fns/locale/en-US';\r\n\r\n//App\r\nimport { Convert } from '../converts/convert';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class LocalizationService {\r\n  dateFnsLocale: any;\r\n\r\n  //i10n\r\n  supportedLanguages: any = ['en', 'ru', 'es'];\r\n  defaultLanguage = 'en';\r\n\r\n  constructor(private translate: TranslateService) {\r\n    this.setSupportedLanguages(this.supportedLanguages);\r\n    this.setDefaultLanguage(this.defaultLanguage);\r\n  }\r\n\r\n  private format(str: string, args) {\r\n    return str.replace(/{(\\d+)}/g, function (match, number) {\r\n      return typeof args[number] != 'undefined'\r\n        ? args[number]\r\n        : match\r\n        ;\r\n    });\r\n  };\r\n\r\n  configureSettings(translate: TranslateService): string {\r\n    //i10n\r\n    const browserLang = translate.getBrowserLang();\r\n    const lang = browserLang.match(/en|ru|es/) ? browserLang : this.defaultLanguage;\r\n\r\n    //dates\r\n    this.dateFnsLocale = { locale: enUS };\r\n\r\n    return lang;\r\n  }\r\n\r\n  getBrowserLanguage(): string {\r\n    return this.translate.getBrowserLang();\r\n  }\r\n\r\n  getDatefnsLocale(): any {\r\n    let dfnLocale: any;\r\n\r\n    switch (this.getBrowserLanguage()) {\r\n      case 'en':\r\n        dfnLocale = { locale: enUS };\r\n        break;\r\n\r\n      default:\r\n        dfnLocale = { locale: enUS };\r\n    }\r\n\r\n    return dfnLocale;\r\n  }\r\n\r\n  setDefaultLanguage(lang: string): void {\r\n    this.translate.setDefaultLang(lang);\r\n  }\r\n\r\n  setSupportedLanguages(languages: string[]): void {\r\n    this.translate.addLangs(languages);\r\n  }\r\n\r\n  updateLanguage(language: string): void {\r\n    this.translate.use(language);\r\n  }\r\n\r\n  getLocalizedValue(key: string, params?: any[]): string {\r\n    const value = this.translate.instant(key);\r\n\r\n    if (!params || params.length === 0) {\r\n      return value;\r\n    }\r\n\r\n    return this.format(value, params);\r\n  }\r\n\r\n  getLocalizedDate(key: string): string {\r\n    if (isValid(new Date(key))) {\r\n      return format(new Date(key), 'dd.MM.yyyy', this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  getLocalizedDateTime(key: string) {\r\n    let dateValue = new Date(key);\r\n    if (isValid(dateValue)) {\r\n      let localDate = Convert.toLocalizedDateTime(dateValue);\r\n      return format(localDate, 'dd.MM.yyyy HH:mm', this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  getLocalizedDistanceInWords(endedDate: string, startedDate: string): string {\r\n    if (isValid(new Date(endedDate)) && isValid(new Date(startedDate))) {\r\n      return formatDistance(new Date(endedDate), new Date(startedDate), this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  getLocalizedDistanceToNowInWords(date: string): string {\r\n    if (isValid(new Date(date))) {\r\n      return formatDistanceToNow(new Date(date), this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n  //UTC Operations --------------------------------------------------------------\r\n  getUTCToLocalizedDate(key: string) {\r\n    let browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;\r\n\r\n    if (key) {\r\n      if (key.indexOf(\"T\") == -1) {\r\n        key = key.replace(\" \", \"T\");\r\n      }\r\n      if (key.indexOf(\"Z\") == -1) {\r\n        key = key + \"Z\";\r\n      }\r\n    }\r\n\r\n    if (browserTimeZone) {\r\n      let localDateTime = utcToZonedTime(key, browserTimeZone);\r\n      return format(localDateTime, 'dd.MM.yyyy', this.dateFnsLocale);\r\n    }\r\n    else {\r\n      return format(new Date(key), 'dd.MM.yyyy', this.dateFnsLocale);\r\n    }\r\n  }\r\n\r\n  getUTCToLocalizedDateTime(key: string) {\r\n    let browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;\r\n\r\n    if (key) {\r\n      if (key.indexOf(\"T\") == -1) {\r\n        key = key.replace(\" \", \"T\");\r\n      }\r\n      if (key.indexOf(\"Z\") == -1) {\r\n        key = key + \"Z\";\r\n      }\r\n    }\r\n\r\n    if (browserTimeZone) {\r\n      let localDateTime = utcToZonedTime(key, browserTimeZone);\r\n      return format(localDateTime, 'dd.MM.yyyy HH:mm', this.dateFnsLocale);\r\n    }\r\n    else {\r\n      return format(new Date(key), 'dd.MM.yyyy HH:mm', this.dateFnsLocale);\r\n    }\r\n  }\r\n\r\n  //https://date-fns.org/v1.30.1/docs/distanceInWords\r\n  getUTCToLocalizedDistanceToNowInWords(date: string): string {\r\n    date = this.safeUtcToZonedTime(date);\r\n\r\n    if (isValid(new Date(date))) {\r\n      return formatDistanceToNow(new Date(date), this.dateFnsLocale);\r\n    }\r\n\r\n    return \"Invalid Date\";\r\n  }\r\n\r\n\r\n  safeUtcToZonedTime(date): string {\r\n    let result = date;\r\n\r\n    try\r\n    {\r\n      if (date) {\r\n        if (date.indexOf(\"T\") == -1) {\r\n          date = date.replace(\" \", \"T\");\r\n        }\r\n\r\n        if (date.indexOf(\"Z\") == -1) {\r\n          date = date + \"Z\";\r\n        }\r\n      }\r\n\r\n      let browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;\r\n      if (browserTimeZone) {\r\n        result = utcToZonedTime(date, browserTimeZone).toString();\r\n      }\r\n      else {\r\n        result = new Date(date).toString();\r\n      }\r\n    }\r\n    catch\r\n    {\r\n      if (date) {\r\n        console.log(\"UTC to Local conversion failed for :\" + date.toString())\r\n      }\r\n    }\r\n\r\n    return result;\r\n  }\r\n}\r\n\r\n"]}
|
|
@@ -28,7 +28,7 @@ export function localizationInitializerFactory(translate, localizationService, i
|
|
|
28
28
|
return () => new Promise((resolve) => {
|
|
29
29
|
let locationInitialized = injector.get(LOCATION_INITIALIZED, Promise.resolve(null));
|
|
30
30
|
locationInitialized.then(() => {
|
|
31
|
-
let languageToSet = localizationService.
|
|
31
|
+
let languageToSet = localizationService.configureSettings(translate);
|
|
32
32
|
translate.use(languageToSet).subscribe({
|
|
33
33
|
next: (data) => {
|
|
34
34
|
},
|
|
@@ -43,7 +43,7 @@ export function localizationInitializerFactory(translate, localizationService, i
|
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
export function translateLoaderFactory(httpClient) {
|
|
46
|
-
return new TranslateHttpLoader(httpClient, `${L10NUrl}/`, `.json
|
|
46
|
+
return new TranslateHttpLoader(httpClient, `${L10NUrl}/`, `.json?v=${AppVersion}`);
|
|
47
47
|
}
|
|
48
48
|
export let LocalizationInjectorInstance;
|
|
49
49
|
export class LocalizationSettingsModule {
|
|
@@ -95,4 +95,4 @@ export class LocalizationSettingsModule {
|
|
|
95
95
|
}]
|
|
96
96
|
}], function () { return [{ type: i0.Injector }]; }, null); })();
|
|
97
97
|
(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(LocalizationSettingsModule, { imports: [HttpClientModule, i1.TranslateModule] }); })();
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dGluZ3MubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5hdG9seS9zcmMvbGliL2NvcmUvbG9jYWxpemF0aW9uL3NldHRpbmdzLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7RUFjRTtBQUVGLE1BQU07QUFDTixPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxlQUFlLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BFLE9BQU8sRUFBRSxlQUFlLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDekYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFakUsS0FBSztBQUNMLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzdELE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFDLE1BQU0sb0JBQW9CLENBQUM7OztBQUV4RCxNQUFNLFVBQVUsOEJBQThCLENBQUMsU0FBMkIsRUFBRSxtQkFBd0MsRUFBRSxRQUFrQjtJQUN0SSxPQUFPLEdBQUcsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFNLENBQUMsT0FBWSxFQUFFLEVBQUU7UUFDN0MsSUFBSSxtQkFBbUIsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLG9CQUFvQixFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNwRixtQkFBbUIsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1lBQzVCLElBQUksYUFBYSxHQUFHLG1CQUFtQixDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQ3JFLFNBQVMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUMsU0FBUyxDQUFDO2dCQUNyQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDZixDQUFDO2dCQUNELEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO29CQUNYLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDaEIsQ0FBQztnQkFDRCxRQUFRLEVBQUUsR0FBRyxFQUFFO29CQUNiLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDaEIsQ0FBQzthQUNGLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUFDLFVBQXNCO0lBQzNELE9BQU8sSUFBSSxtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsR0FBRyxPQUFPLEdBQUcsRUFBRyxXQUFXLFVBQVUsRUFBRSxDQUFDLENBQUM7QUFDdEYsQ0FBQztBQUVELE1BQU0sQ0FBQyxJQUFJLDRCQUFzQyxDQUFDO0FBd0JsRCxNQUFNLE9BQU8sMEJBQTBCO0lBQ2pCO0lBQXBCLFlBQW9CLFFBQWtCO1FBQWxCLGFBQVEsR0FBUixRQUFRLENBQVU7UUFDcEMsNEJBQTRCLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUMvQyxDQUFDO29GQUhVLDBCQUEwQjs0REFBMUIsMEJBQTBCO2lFQVgxQjtZQUNUO2dCQUNFLE9BQU8sRUFBRSxlQUFlO2dCQUN4QixVQUFVLEVBQUUsOEJBQThCO2dCQUMxQyxJQUFJLEVBQUUsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsRUFBRSxRQUFRLENBQUM7Z0JBQ3ZELEtBQUssRUFBRSxJQUFJO2FBQ1o7U0FDRixZQWhCQyxnQkFBZ0I7WUFDaEIsZUFBZSxDQUFDLE9BQU8sQ0FBQztnQkFDdEIsTUFBTSxFQUFFO29CQUNOLE9BQU8sRUFBRSxlQUFlO29CQUN4QixVQUFVLEVBQUUsc0JBQXNCO29CQUNsQyxJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUM7aUJBQ25CO2FBQ0YsQ0FBQzs7dUZBYU8sMEJBQTBCO2NBdEJ0QyxRQUFRO2VBQUM7Z0JBQ1IsT0FBTyxFQUFFO29CQUNQLGdCQUFnQjtvQkFDaEIsZUFBZSxDQUFDLE9BQU8sQ0FBQzt3QkFDdEIsTUFBTSxFQUFFOzRCQUNOLE9BQU8sRUFBRSxlQUFlOzRCQUN4QixVQUFVLEVBQUUsc0JBQXNCOzRCQUNsQyxJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUM7eUJBQ25CO3FCQUNGLENBQUM7aUJBQ0g7Z0JBQ0QsU0FBUyxFQUFFO29CQUNUO3dCQUNFLE9BQU8sRUFBRSxlQUFlO3dCQUN4QixVQUFVLEVBQUUsOEJBQThCO3dCQUMxQyxJQUFJLEVBQUUsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsRUFBRSxRQUFRLENBQUM7d0JBQ3ZELEtBQUssRUFBRSxJQUFJO3FCQUNaO2lCQUNGO2dCQUNELE9BQU8sRUFBRSxFQUNSO2FBQ0Y7O3dGQUNZLDBCQUEwQixjQXBCbkMsZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiLypcclxuPGZpbGU+XHJcbiAgUHJvamVjdDpcclxuICAgIEBvc292aXRueS9hbmF0b2x5XHJcblxyXG4gIEF1dGhvcnM6XHJcbiAgICBWYWRpbSBPc292aXRueSB2YWRpbUBvc292aXRueS5jb21cclxuICAgIEFuYXRvbHkgT3Nvdml0bnkgYW5hdG9seUBvc292aXRueS5jb21cclxuXHJcbiAgQ3JlYXRlZDpcclxuICAgICAwNSBNYXkgMjAyMFxyXG5cclxuICBDb3B5cmlnaHQgKGMpIDIwMTYtMjAyMiBPc292aXRueSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuXHJcbjwvZmlsZT5cclxuKi9cclxuXHJcbi8vTm9kZVxyXG5pbXBvcnQgeyBOZ01vZHVsZSwgSW5qZWN0b3IsIEFQUF9JTklUSUFMSVpFUiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBMT0NBVElPTl9JTklUSUFMSVpFRCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XHJcbmltcG9ydCB7IEh0dHBDbGllbnRNb2R1bGUsIEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcbmltcG9ydCB7IFRyYW5zbGF0ZUxvYWRlciwgVHJhbnNsYXRlTW9kdWxlLCBUcmFuc2xhdGVTZXJ2aWNlIH0gZnJvbSAnQG5neC10cmFuc2xhdGUvY29yZSc7XHJcbmltcG9ydCB7IFRyYW5zbGF0ZUh0dHBMb2FkZXIgfSBmcm9tICdAbmd4LXRyYW5zbGF0ZS9odHRwLWxvYWRlcic7XHJcblxyXG4vL0FwcFxyXG5pbXBvcnQgeyBMb2NhbGl6YXRpb25TZXJ2aWNlIH0gZnJvbSAnLi9sb2NhbGl6YXRpb24uc2VydmljZSc7XHJcbmltcG9ydCB7IEwxME5VcmwsIEFwcFZlcnNpb259IGZyb20gJy4uL2NvbnN0cy9zZXR0aW5ncyc7XHJcblxyXG5leHBvcnQgZnVuY3Rpb24gbG9jYWxpemF0aW9uSW5pdGlhbGl6ZXJGYWN0b3J5KHRyYW5zbGF0ZTogVHJhbnNsYXRlU2VydmljZSwgbG9jYWxpemF0aW9uU2VydmljZTogTG9jYWxpemF0aW9uU2VydmljZSwgaW5qZWN0b3I6IEluamVjdG9yKSB7XHJcbiAgcmV0dXJuICgpID0+IG5ldyBQcm9taXNlPGFueT4oKHJlc29sdmU6IGFueSkgPT4ge1xyXG4gICAgbGV0IGxvY2F0aW9uSW5pdGlhbGl6ZWQgPSBpbmplY3Rvci5nZXQoTE9DQVRJT05fSU5JVElBTElaRUQsIFByb21pc2UucmVzb2x2ZShudWxsKSk7XHJcbiAgICBsb2NhdGlvbkluaXRpYWxpemVkLnRoZW4oKCkgPT4ge1xyXG4gICAgICBsZXQgbGFuZ3VhZ2VUb1NldCA9IGxvY2FsaXphdGlvblNlcnZpY2UuY29uZmlndXJlU2V0dGluZ3ModHJhbnNsYXRlKTtcclxuICAgICAgdHJhbnNsYXRlLnVzZShsYW5ndWFnZVRvU2V0KS5zdWJzY3JpYmUoe1xyXG4gICAgICAgIG5leHQ6IChkYXRhKSA9PiB7XHJcbiAgICAgICAgfSxcclxuICAgICAgICBlcnJvcjogKGUpID0+IHtcclxuICAgICAgICAgIHJlc29sdmUobnVsbCk7XHJcbiAgICAgICAgfSxcclxuICAgICAgICBjb21wbGV0ZTogKCkgPT4ge1xyXG4gICAgICAgICAgcmVzb2x2ZShudWxsKTtcclxuICAgICAgICB9XHJcbiAgICAgIH0pO1xyXG4gICAgfSk7XHJcbiAgfSk7XHJcbn1cclxuXHJcbmV4cG9ydCBmdW5jdGlvbiB0cmFuc2xhdGVMb2FkZXJGYWN0b3J5KGh0dHBDbGllbnQ6IEh0dHBDbGllbnQpOiBUcmFuc2xhdGVIdHRwTG9hZGVyIHtcclxuICByZXR1cm4gbmV3IFRyYW5zbGF0ZUh0dHBMb2FkZXIoaHR0cENsaWVudCwgYCR7TDEwTlVybH0vYCwgIGAuanNvbj92PSR7QXBwVmVyc2lvbn1gKTtcclxufVxyXG5cclxuZXhwb3J0IGxldCBMb2NhbGl6YXRpb25JbmplY3Rvckluc3RhbmNlOiBJbmplY3RvcjtcclxuXHJcbkBOZ01vZHVsZSh7XHJcbiAgaW1wb3J0czogW1xyXG4gICAgSHR0cENsaWVudE1vZHVsZSxcclxuICAgIFRyYW5zbGF0ZU1vZHVsZS5mb3JSb290KHtcclxuICAgICAgbG9hZGVyOiB7XHJcbiAgICAgICAgcHJvdmlkZTogVHJhbnNsYXRlTG9hZGVyLFxyXG4gICAgICAgIHVzZUZhY3Rvcnk6IHRyYW5zbGF0ZUxvYWRlckZhY3RvcnksXHJcbiAgICAgICAgZGVwczogW0h0dHBDbGllbnRdXHJcbiAgICAgIH1cclxuICAgIH0pXHJcbiAgXSxcclxuICBwcm92aWRlcnM6IFtcclxuICAgIHtcclxuICAgICAgcHJvdmlkZTogQVBQX0lOSVRJQUxJWkVSLFxyXG4gICAgICB1c2VGYWN0b3J5OiBsb2NhbGl6YXRpb25Jbml0aWFsaXplckZhY3RvcnksXHJcbiAgICAgIGRlcHM6IFtUcmFuc2xhdGVTZXJ2aWNlLCBMb2NhbGl6YXRpb25TZXJ2aWNlLCBJbmplY3Rvcl0sXHJcbiAgICAgIG11bHRpOiB0cnVlXHJcbiAgICB9XHJcbiAgXSxcclxuICBleHBvcnRzOiBbXHJcbiAgXVxyXG59KVxyXG5leHBvcnQgY2xhc3MgTG9jYWxpemF0aW9uU2V0dGluZ3NNb2R1bGUge1xyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgaW5qZWN0b3I6IEluamVjdG9yKSB7XHJcbiAgICBMb2NhbGl6YXRpb25JbmplY3Rvckluc3RhbmNlID0gdGhpcy5pbmplY3RvcjtcclxuICB9XHJcbn1cclxuXHJcbiJdfQ==
|
|
@@ -486,10 +486,13 @@ class AnatolyHttpInterceptor {
|
|
|
486
486
|
class LocalizationService {
|
|
487
487
|
translate;
|
|
488
488
|
dateFnsLocale;
|
|
489
|
+
//i10n
|
|
489
490
|
supportedLanguages = ['en', 'ru', 'es'];
|
|
491
|
+
defaultLanguage = 'en';
|
|
490
492
|
constructor(translate) {
|
|
491
493
|
this.translate = translate;
|
|
492
494
|
this.setSupportedLanguages(this.supportedLanguages);
|
|
495
|
+
this.setDefaultLanguage(this.defaultLanguage);
|
|
493
496
|
}
|
|
494
497
|
format(str, args) {
|
|
495
498
|
return str.replace(/{(\d+)}/g, function (match, number) {
|
|
@@ -499,11 +502,13 @@ class LocalizationService {
|
|
|
499
502
|
});
|
|
500
503
|
}
|
|
501
504
|
;
|
|
502
|
-
|
|
503
|
-
|
|
505
|
+
configureSettings(translate) {
|
|
506
|
+
//i10n
|
|
507
|
+
const browserLang = translate.getBrowserLang();
|
|
508
|
+
const lang = browserLang.match(/en|ru|es/) ? browserLang : this.defaultLanguage;
|
|
509
|
+
//dates
|
|
504
510
|
this.dateFnsLocale = { locale: enUS };
|
|
505
|
-
|
|
506
|
-
return languageToSet;
|
|
511
|
+
return lang;
|
|
507
512
|
}
|
|
508
513
|
getBrowserLanguage() {
|
|
509
514
|
return this.translate.getBrowserLang();
|
|
@@ -735,7 +740,7 @@ function localizationInitializerFactory(translate, localizationService, injector
|
|
|
735
740
|
return () => new Promise((resolve) => {
|
|
736
741
|
let locationInitialized = injector.get(LOCATION_INITIALIZED, Promise.resolve(null));
|
|
737
742
|
locationInitialized.then(() => {
|
|
738
|
-
let languageToSet = localizationService.
|
|
743
|
+
let languageToSet = localizationService.configureSettings(translate);
|
|
739
744
|
translate.use(languageToSet).subscribe({
|
|
740
745
|
next: (data) => {
|
|
741
746
|
},
|
|
@@ -750,7 +755,7 @@ function localizationInitializerFactory(translate, localizationService, injector
|
|
|
750
755
|
});
|
|
751
756
|
}
|
|
752
757
|
function translateLoaderFactory(httpClient) {
|
|
753
|
-
return new TranslateHttpLoader(httpClient, `${L10NUrl}/`, `.json
|
|
758
|
+
return new TranslateHttpLoader(httpClient, `${L10NUrl}/`, `.json?v=${AppVersion}`);
|
|
754
759
|
}
|
|
755
760
|
let LocalizationInjectorInstance;
|
|
756
761
|
class LocalizationSettingsModule {
|