@zwa73/utils 1.0.143 → 1.0.144
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/dist/UtilI18n.js +6 -2
- package/package.json +1 -1
- package/src/UtilI18n.ts +6 -3
package/dist/UtilI18n.js
CHANGED
|
@@ -17,6 +17,10 @@ const I18nFlagTable = {
|
|
|
17
17
|
const LangFlagList = Object.entries(I18nFlagTable)
|
|
18
18
|
.map(([k, v]) => `${k}-${v}`)
|
|
19
19
|
.concat(Object.keys(I18nFlagTable));
|
|
20
|
+
const parseLangFlag = (lf) => {
|
|
21
|
+
const match = lf.match(/^([^-]+)(.+)/);
|
|
22
|
+
return { 1: match[1], 2: match[2] != '' ? match[2] : undefined };
|
|
23
|
+
};
|
|
20
24
|
const MarkRegex = /%%%([^%]+)%%%$/;
|
|
21
25
|
const BaseFile = 'base_lang.json';
|
|
22
26
|
const TemplateFile = 'template.json';
|
|
@@ -53,7 +57,7 @@ class SI18n {
|
|
|
53
57
|
* @param i18nDataDir - 国际化数据的路径。
|
|
54
58
|
* @param lang - 要设置的语言。
|
|
55
59
|
*/
|
|
56
|
-
static async init(i18nDataDir, lang) {
|
|
60
|
+
static async init(i18nDataDir, lang = '*') {
|
|
57
61
|
const date = new Date().toISOString();
|
|
58
62
|
const mergePath = pathe_1.default.join(i18nDataDir, BaseFile);
|
|
59
63
|
const table = await UtilFileTools_1.UtilFT.loadJSONFile(mergePath, { default: {
|
|
@@ -68,7 +72,7 @@ class SI18n {
|
|
|
68
72
|
SI18n._vaildLang = ['template'];
|
|
69
73
|
//覆盖入单语言文件
|
|
70
74
|
const singleDir = pathe_1.default.join(i18nDataDir, LangDir);
|
|
71
|
-
(await Promise.all((await UtilFileTools_1.UtilFT.fileSearchGlob(singleDir, `**/${lang}*.json`))
|
|
75
|
+
(await Promise.all((await UtilFileTools_1.UtilFT.fileSearchGlob(singleDir, `**/${parseLangFlag(lang)[1]}*.json`))
|
|
72
76
|
.map(async (p) => await UtilFileTools_1.UtilFT.loadJSONFile(p))))
|
|
73
77
|
.forEach(t => {
|
|
74
78
|
SI18n._vaildLang?.push(t.target_lang);
|
package/package.json
CHANGED
package/src/UtilI18n.ts
CHANGED
|
@@ -64,7 +64,10 @@ export type I18nTextData = I18nOrigTextData&{lang_table:PRecord<LangFlag,string>
|
|
|
64
64
|
export type I18nTable = Omit<I18nOrigTable,'texts'>&{
|
|
65
65
|
text_table:Record<string,I18nTextData>;
|
|
66
66
|
}
|
|
67
|
-
|
|
67
|
+
const parseLangFlag = (lf:LangFlag|'*')=>{
|
|
68
|
+
const match = lf.match(/^([^-]+)(.+)/)!
|
|
69
|
+
return {1:match[1],2:match[2]!='' ? match[2]:undefined};
|
|
70
|
+
}
|
|
68
71
|
|
|
69
72
|
const MarkRegex = /%%%([^%]+)%%%$/;
|
|
70
73
|
const BaseFile = 'base_lang.json';
|
|
@@ -102,7 +105,7 @@ export class SI18n {
|
|
|
102
105
|
* @param i18nDataDir - 国际化数据的路径。
|
|
103
106
|
* @param lang - 要设置的语言。
|
|
104
107
|
*/
|
|
105
|
-
static async init(i18nDataDir:string,lang
|
|
108
|
+
static async init(i18nDataDir:string,lang:LangFlag|'*'='*'){
|
|
106
109
|
const date = new Date().toISOString();
|
|
107
110
|
const mergePath = path.join(i18nDataDir,BaseFile);
|
|
108
111
|
const table = await UtilFT.loadJSONFile<I18nOrigTable>(mergePath,{default:{
|
|
@@ -119,7 +122,7 @@ export class SI18n {
|
|
|
119
122
|
SI18n._vaildLang=['template'];
|
|
120
123
|
//覆盖入单语言文件
|
|
121
124
|
const singleDir = path.join(i18nDataDir,LangDir);
|
|
122
|
-
(await Promise.all((await UtilFT.fileSearchGlob(singleDir,`**/${lang}*.json`))
|
|
125
|
+
(await Promise.all((await UtilFT.fileSearchGlob(singleDir,`**/${parseLangFlag(lang)[1]}*.json`))
|
|
123
126
|
.map(async p=>await UtilFT.loadJSONFile(p) as I18nSingleTable)))
|
|
124
127
|
.forEach(t=>{
|
|
125
128
|
SI18n._vaildLang?.push(t.target_lang);
|