@companieshouse/ch-node-utils 1.3.8 → 1.3.10
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/lib/constants/constants.d.ts +3 -0
- package/lib/constants/constants.js +6 -1
- package/lib/constants/constants.js.map +1 -1
- package/lib/utils/i18nCh.d.ts +5 -0
- package/lib/utils/i18nCh.js +45 -12
- package/lib/utils/i18nCh.js.map +1 -1
- package/package.json +3 -2
- /package/locales/cy/{navbar.json → ch-node-utils-navbar.json} +0 -0
- /package/locales/en/{navbar.json → ch-node-utils-navbar.json} +0 -0
|
@@ -1 +1,4 @@
|
|
|
1
1
|
export declare const QUERY_PAR_LANG = "lang";
|
|
2
|
+
export declare const NODE_MODULES_LOCALES_PATH = "node_modules/@companieshouse/ch-node-utils/locales";
|
|
3
|
+
export declare const SHARED_NAVBAR_NAMESPACE = "ch-node-utils-navbar";
|
|
4
|
+
export declare const SHARED_NUNJUCKS_TRANSLATION_NAMESPACES: Set<string>;
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.QUERY_PAR_LANG = void 0;
|
|
3
|
+
exports.SHARED_NUNJUCKS_TRANSLATION_NAMESPACES = exports.SHARED_NAVBAR_NAMESPACE = exports.NODE_MODULES_LOCALES_PATH = exports.QUERY_PAR_LANG = void 0;
|
|
4
4
|
exports.QUERY_PAR_LANG = "lang";
|
|
5
|
+
exports.NODE_MODULES_LOCALES_PATH = 'node_modules/@companieshouse/ch-node-utils/locales';
|
|
6
|
+
exports.SHARED_NAVBAR_NAMESPACE = "ch-node-utils-navbar";
|
|
7
|
+
exports.SHARED_NUNJUCKS_TRANSLATION_NAMESPACES = new Set([
|
|
8
|
+
exports.SHARED_NAVBAR_NAMESPACE
|
|
9
|
+
]);
|
|
5
10
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,MAAM,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,MAAM,CAAA;AACvB,QAAA,yBAAyB,GAAG,oDAAoD,CAAC;AACjF,QAAA,uBAAuB,GAAG,sBAAsB,CAAA;AAChD,QAAA,sCAAsC,GAAG,IAAI,GAAG,CAAC;IAC5D,+BAAuB;CACxB,CAAC,CAAC"}
|
package/lib/utils/i18nCh.d.ts
CHANGED
|
@@ -2,12 +2,17 @@ export default class i18nCh {
|
|
|
2
2
|
private static instance;
|
|
3
3
|
private i18nInst;
|
|
4
4
|
private localesFolder;
|
|
5
|
+
private nodeModulesFolder;
|
|
5
6
|
private nameSpaces;
|
|
6
7
|
private constructor();
|
|
7
8
|
static getInstance(localesFolder?: string, nameSpaces?: string[], lang?: string): i18nCh;
|
|
8
9
|
private loadAllNamespaces;
|
|
10
|
+
private loadNamespacesFromFolder;
|
|
11
|
+
private getLanguageFolders;
|
|
12
|
+
private getFoldersFromPath;
|
|
9
13
|
private changeLanguage;
|
|
10
14
|
resolveNamespacesKeys(lang: string, vars?: any): any;
|
|
11
15
|
resolveSingleKey(key: string, lang: string, vars?: any): string;
|
|
12
16
|
loadNamespaces(nameSpaces?: string[]): void;
|
|
17
|
+
getResourceBundle(lng: string, ns: string): any;
|
|
13
18
|
}
|
package/lib/utils/i18nCh.js
CHANGED
|
@@ -6,6 +6,7 @@ const i18next_fs_backend_1 = tslib_1.__importDefault(require("i18next-fs-backend
|
|
|
6
6
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
7
|
const fs_1 = tslib_1.__importStar(require("fs"));
|
|
8
8
|
const log_1 = tslib_1.__importDefault(require("./log"));
|
|
9
|
+
const constants_1 = require("../constants/constants");
|
|
9
10
|
class i18nCh {
|
|
10
11
|
constructor(localesFolder = "", nameSpaces = [], lang = "en") {
|
|
11
12
|
this.nameSpaces = [];
|
|
@@ -14,6 +15,7 @@ class i18nCh {
|
|
|
14
15
|
throw new Error("i18nCh initialization error: path to locales must be provided");
|
|
15
16
|
}
|
|
16
17
|
this.localesFolder = localesFolder;
|
|
18
|
+
this.nodeModulesFolder = constants_1.NODE_MODULES_LOCALES_PATH;
|
|
17
19
|
if (nameSpaces.length === 0) {
|
|
18
20
|
nameSpaces = this.loadAllNamespaces();
|
|
19
21
|
}
|
|
@@ -27,12 +29,13 @@ class i18nCh {
|
|
|
27
29
|
partialBundledLanguages: true,
|
|
28
30
|
lng: lang,
|
|
29
31
|
fallbackLng: "en",
|
|
30
|
-
preload:
|
|
31
|
-
const joinedPath = path_1.default.join(localesFolder, fileName);
|
|
32
|
-
return (0, fs_1.lstatSync)(joinedPath).isDirectory();
|
|
33
|
-
}),
|
|
32
|
+
preload: this.getLanguageFolders(),
|
|
34
33
|
backend: {
|
|
35
|
-
loadPath:
|
|
34
|
+
loadPath: (lng, ns) => {
|
|
35
|
+
const projectPath = path_1.default.join(this.localesFolder, `${lng}/${ns}.json`);
|
|
36
|
+
const nodePath = path_1.default.join(this.nodeModulesFolder, `${lng}/${ns}.json`);
|
|
37
|
+
return fs_1.default.existsSync(projectPath) ? projectPath : nodePath;
|
|
38
|
+
}
|
|
36
39
|
}
|
|
37
40
|
});
|
|
38
41
|
}
|
|
@@ -47,15 +50,42 @@ class i18nCh {
|
|
|
47
50
|
return i18nCh.instance;
|
|
48
51
|
}
|
|
49
52
|
loadAllNamespaces() {
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
const allNamespaces = [
|
|
54
|
+
this.loadNamespacesFromFolder(this.localesFolder),
|
|
55
|
+
this.loadNamespacesFromFolder(this.nodeModulesFolder)
|
|
56
|
+
];
|
|
57
|
+
return [...new Set(allNamespaces.flat())];
|
|
58
|
+
}
|
|
59
|
+
loadNamespacesFromFolder(baseFolder) {
|
|
60
|
+
const folderPath = path_1.default.join(baseFolder, "en");
|
|
61
|
+
try {
|
|
62
|
+
return fs_1.default.readdirSync(folderPath)
|
|
63
|
+
.filter(file => path_1.default.extname(file) === ".json")
|
|
64
|
+
.map(file => path_1.default.basename(file, ".json"));
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
(0, log_1.default)(`Error reading directory ${folderPath}: ${error}`);
|
|
68
|
+
return [];
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
getLanguageFolders() {
|
|
72
|
+
const allFolders = [
|
|
73
|
+
this.getFoldersFromPath(this.localesFolder),
|
|
74
|
+
this.getFoldersFromPath(this.nodeModulesFolder)
|
|
75
|
+
];
|
|
76
|
+
return [...new Set(allFolders.flat())];
|
|
77
|
+
}
|
|
78
|
+
getFoldersFromPath(folderPath) {
|
|
79
|
+
try {
|
|
80
|
+
return (0, fs_1.readdirSync)(folderPath).filter((fileName) => {
|
|
81
|
+
const joinedPath = path_1.default.join(folderPath, fileName);
|
|
82
|
+
return (0, fs_1.lstatSync)(joinedPath).isDirectory();
|
|
56
83
|
});
|
|
57
84
|
}
|
|
58
|
-
|
|
85
|
+
catch (error) {
|
|
86
|
+
(0, log_1.default)(`Error reading language folders from ${folderPath}: ${error}`);
|
|
87
|
+
return [];
|
|
88
|
+
}
|
|
59
89
|
}
|
|
60
90
|
changeLanguage(lang) {
|
|
61
91
|
this.i18nInst.changeLanguage(lang, (err) => {
|
|
@@ -109,6 +139,9 @@ class i18nCh {
|
|
|
109
139
|
});
|
|
110
140
|
}
|
|
111
141
|
}
|
|
142
|
+
getResourceBundle(lng, ns) {
|
|
143
|
+
return this.i18nInst.getResourceBundle(lng, ns);
|
|
144
|
+
}
|
|
112
145
|
}
|
|
113
146
|
exports.default = i18nCh;
|
|
114
147
|
//# sourceMappingURL=i18nCh.js.map
|
package/lib/utils/i18nCh.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18nCh.js","sourceRoot":"","sources":["../../src/utils/i18nCh.ts"],"names":[],"mappings":";;;AAAA,8DAA6B;AAC7B,oFAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"i18nCh.js","sourceRoot":"","sources":["../../src/utils/i18nCh.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@companieshouse/ch-node-utils",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.10",
|
|
4
4
|
"author": "companieshouse",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -40,7 +40,8 @@
|
|
|
40
40
|
"express": "^4.18.3",
|
|
41
41
|
"i18next": "^23.10.1",
|
|
42
42
|
"i18next-fs-backend": "^2.3.1",
|
|
43
|
-
"iso-639-1": "^3.1.2"
|
|
43
|
+
"iso-639-1": "^3.1.2",
|
|
44
|
+
"tslib": "^2.3.0"
|
|
44
45
|
},
|
|
45
46
|
"devDependencies": {
|
|
46
47
|
"@types/express": "^4.17.21",
|
|
File without changes
|
|
File without changes
|