@flashist/flibs 0.0.107 → 0.0.110

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.
@@ -35,12 +35,27 @@ var LocaleManager = /** @class */ (function () {
35
35
  };
36
36
  LocaleManager.prototype.getText = function (textId, params) {
37
37
  if (params === void 0) { params = null; }
38
- var result = "";
38
+ // The text id will be used in the case of no text found
39
+ var result = textId;
39
40
  if (this.currentLocale) {
40
- if (this.currentLocale.texts[textId]) {
41
- result = this.currentLocale.texts[textId];
42
- result = this.format(result, params);
41
+ var pathsToText = textId.split(".");
42
+ var curPathLevel = this.currentLocale.texts;
43
+ var pathsCount = pathsToText.length;
44
+ for (var pathIndex = 0; pathIndex < pathsCount; pathIndex++) {
45
+ var tempPathId = pathsToText[pathIndex];
46
+ if (curPathLevel[tempPathId]) {
47
+ curPathLevel = curPathLevel[tempPathId];
48
+ // If it's the final path
49
+ if (pathIndex === pathsCount - 1) {
50
+ result = curPathLevel;
51
+ result = this.format(result, params);
52
+ }
53
+ }
43
54
  }
55
+ // if (this.currentLocale.texts[textId]) {
56
+ // result = this.currentLocale.texts[textId];
57
+ // result = this.format(result, params);
58
+ // }
44
59
  }
45
60
  return result;
46
61
  };
@@ -66,7 +81,8 @@ var LocaleManager = /** @class */ (function () {
66
81
  for (var _i = 2; _i < arguments.length; _i++) {
67
82
  args[_i - 2] = arguments[_i];
68
83
  }
69
- return this.currentLocale.texts[group1];
84
+ // return this.currentLocale.texts[group1];
85
+ return this.getText(group1);
70
86
  };
71
87
  return LocaleManager;
72
88
  }());
@@ -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.107",
3
+ "version": "0.0.110",
4
4
  "scripts": {
5
5
  "build": "gulp",
6
6
  "publish:patch": "npm version patch && npm run build && cd ./dist && npm publish",