@flashist/flibs 0.0.265 → 0.0.267

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.
@@ -1,14 +1,15 @@
1
1
  import { ILocaleConfig } from "./ILocaleConfig";
2
2
  export declare class LocaleManager {
3
3
  protected localeToIdMap: any;
4
- private _currentLanguage;
5
- protected currentLocale: ILocaleConfig;
4
+ private _currentLocaleId;
5
+ protected currentLocaleTexts: ILocaleConfig;
6
+ protected defaultLocaleId: string;
6
7
  useTextLinks: boolean;
7
8
  protected bindMethodReplaceRegExpKeyByStrings: (substring: string, ...params: any[]) => string;
8
9
  constructor();
9
- addLocale(data: ILocaleConfig, localeId: string): void;
10
- getCurrentLanguage(): string;
11
- setCurrentLanguage(value: string): void;
10
+ addLocaleTexts(data: ILocaleConfig, localeId: string): void;
11
+ getCurrentLocaleId(): string;
12
+ setCurrentLocaleId(value: string): void;
12
13
  protected commitLocaleData(): void;
13
14
  getText(textId: string, params?: any): string;
14
15
  protected format(str: string, params?: any): string;
@@ -1,13 +1,15 @@
1
1
  import { ObjectTools, StringTools } from "@flashist/fcore";
2
2
  import { getInstance } from "../servicelocator/ServiceLocatorShortcuts";
3
+ import { LocaleId } from "./LocaleId";
3
4
  export class LocaleManager {
4
5
  constructor() {
5
6
  this.useTextLinks = true;
6
7
  this.localeToIdMap = {};
7
8
  this.bindMethodReplaceRegExpKeyByStrings = this.replaceRegExpKeyByStrings.bind(this);
8
- this.setCurrentLanguage("");
9
+ this.defaultLocaleId = LocaleId.EN;
10
+ this.setCurrentLocaleId("");
9
11
  }
10
- addLocale(data, localeId) {
12
+ addLocaleTexts(data, localeId) {
11
13
  // Support adding texts to the old localization
12
14
  let oldLocale = {
13
15
  texts: {}
@@ -20,25 +22,30 @@ export class LocaleManager {
20
22
  this.localeToIdMap[localeId] = oldLocale;
21
23
  this.commitLocaleData();
22
24
  }
23
- getCurrentLanguage() {
24
- return this._currentLanguage;
25
+ getCurrentLocaleId() {
26
+ return this._currentLocaleId;
25
27
  }
26
- setCurrentLanguage(value) {
27
- if (value == this._currentLanguage) {
28
+ setCurrentLocaleId(value) {
29
+ if (value == this._currentLocaleId) {
28
30
  return;
29
31
  }
30
- this._currentLanguage = value;
32
+ this._currentLocaleId = value;
31
33
  this.commitLocaleData();
32
34
  }
33
35
  commitLocaleData() {
34
- this.currentLocale = this.localeToIdMap[this._currentLanguage];
36
+ // this.currentLocaleTexts = this.localeToIdMap[this._currentLocaleId];
37
+ let newLocaleTexts = this.localeToIdMap[this._currentLocaleId];
38
+ if (!newLocaleTexts) {
39
+ newLocaleTexts = this.localeToIdMap[this.defaultLocaleId];
40
+ }
41
+ this.currentLocaleTexts = newLocaleTexts;
35
42
  }
36
43
  getText(textId, params = null) {
37
44
  // The text id will be used in the case of no text found
38
45
  let result = textId;
39
- if (this.currentLocale) {
46
+ if (this.currentLocaleTexts) {
40
47
  const pathsToText = textId.split(".");
41
- let curPathLevel = this.currentLocale.texts;
48
+ let curPathLevel = this.currentLocaleTexts.texts;
42
49
  const pathsCount = pathsToText.length;
43
50
  for (let pathIndex = 0; pathIndex < pathsCount; pathIndex++) {
44
51
  const tempPathId = pathsToText[pathIndex];
@@ -80,7 +87,7 @@ export class LocaleManager {
80
87
  }
81
88
  findAllUniqueCharactersForCurrentLocale() {
82
89
  const allTexts = [];
83
- this.getAllTextsOf(this.currentLocale.texts, allTexts);
90
+ this.getAllTextsOf(this.currentLocaleTexts.texts, allTexts);
84
91
  let usedCharactersMap = {};
85
92
  let result = [];
86
93
  for (let singleText of allTexts) {
@@ -1 +1 @@
1
- {"version":3,"file":"LocaleManager.js","sourceRoot":"","sources":["../../src/locale/LocaleManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocaleManager.js","sourceRoot":"","sources":["../../src/locale/LocaleManager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flashist/flibs",
3
- "version": "0.0.265",
3
+ "version": "0.0.267",
4
4
  "scripts": {},
5
5
  "license": "MIT",
6
6
  "private": false,