@theia/core 1.24.0-next.69 → 1.24.0-next.72
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/README.md +3 -3
- package/lib/common/nls.d.ts.map +1 -1
- package/lib/common/nls.js +15 -15
- package/lib/common/nls.js.map +1 -1
- package/package.json +3 -3
- package/src/common/nls.ts +15 -15
package/README.md
CHANGED
|
@@ -86,9 +86,9 @@ export class SomeClass {
|
|
|
86
86
|
- `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
|
|
87
87
|
- `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
|
|
88
88
|
- `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
|
|
89
|
-
- `@theia/application-package` (from [`@theia/application-package@1.24.0-next.
|
|
90
|
-
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.24.0-next.
|
|
91
|
-
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.24.0-next.
|
|
89
|
+
- `@theia/application-package` (from [`@theia/application-package@1.24.0-next.72+da55b6a4035`](https://www.npmjs.com/package/@theia/application-package/v/1.24.0-next.72))
|
|
90
|
+
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.24.0-next.72+da55b6a4035`](https://www.npmjs.com/package/@theia/application-package/v/1.24.0-next.72))
|
|
91
|
+
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.24.0-next.72+da55b6a4035`](https://www.npmjs.com/package/@theia/application-package/v/1.24.0-next.72))
|
|
92
92
|
- `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
|
|
93
93
|
- `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
|
|
94
94
|
- `inversify` (from [`inversify@^5.1.1`](https://www.npmjs.com/package/inversify))
|
package/lib/common/nls.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nls.d.ts","sourceRoot":"","sources":["../../src/common/nls.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE/D,yBAAiB,GAAG,CAAC;IAEV,IAAI,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IAE3C,MAAM,QAAQ,aAAa,CAAC;IAE5B,MAAM,MAAM,oBAA6F,CAAC;IAIjH;;OAEG;IACH,SAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"nls.d.ts","sourceRoot":"","sources":["../../src/common/nls.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE/D,yBAAiB,GAAG,CAAC;IAEV,IAAI,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IAE3C,MAAM,QAAQ,aAAa,CAAC;IAE5B,MAAM,MAAM,oBAA6F,CAAC;IAIjH;;OAEG;IACH,SAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAUrF;IAED,SAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAS1D;IAED,SAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAEzF;CACJ"}
|
package/lib/common/nls.js
CHANGED
|
@@ -26,26 +26,26 @@ var nls;
|
|
|
26
26
|
* Automatically localizes a text if that text also exists in the vscode repository.
|
|
27
27
|
*/
|
|
28
28
|
function localizeByDefault(defaultValue, ...args) {
|
|
29
|
-
const key = getDefaultKey(defaultValue);
|
|
30
|
-
if (key) {
|
|
31
|
-
return localize(key, defaultValue, ...args);
|
|
32
|
-
}
|
|
33
|
-
return localization_1.Localization.format(defaultValue, args);
|
|
34
|
-
}
|
|
35
|
-
nls.localizeByDefault = localizeByDefault;
|
|
36
|
-
function getDefaultKey(defaultValue) {
|
|
37
29
|
if (nls.localization) {
|
|
38
|
-
|
|
39
|
-
keyProvider = new LocalizationKeyProvider();
|
|
40
|
-
}
|
|
41
|
-
const key = keyProvider.get(defaultValue);
|
|
30
|
+
const key = getDefaultKey(defaultValue);
|
|
42
31
|
if (key) {
|
|
43
|
-
return key;
|
|
32
|
+
return localize(key, defaultValue, ...args);
|
|
44
33
|
}
|
|
45
34
|
else {
|
|
46
35
|
console.warn(`Could not find translation key for default value: "${defaultValue}"`);
|
|
47
36
|
}
|
|
48
37
|
}
|
|
38
|
+
return localization_1.Localization.format(defaultValue, args);
|
|
39
|
+
}
|
|
40
|
+
nls.localizeByDefault = localizeByDefault;
|
|
41
|
+
function getDefaultKey(defaultValue) {
|
|
42
|
+
if (!keyProvider) {
|
|
43
|
+
keyProvider = new LocalizationKeyProvider();
|
|
44
|
+
}
|
|
45
|
+
const key = keyProvider.get(defaultValue);
|
|
46
|
+
if (key) {
|
|
47
|
+
return key;
|
|
48
|
+
}
|
|
49
49
|
return '';
|
|
50
50
|
}
|
|
51
51
|
nls.getDefaultKey = getDefaultKey;
|
|
@@ -59,7 +59,7 @@ class LocalizationKeyProvider {
|
|
|
59
59
|
this.data = this.buildData();
|
|
60
60
|
}
|
|
61
61
|
get(defaultValue) {
|
|
62
|
-
return this.data.get(defaultValue);
|
|
62
|
+
return this.data.get(localization_1.Localization.normalize(defaultValue.toLowerCase()));
|
|
63
63
|
}
|
|
64
64
|
/**
|
|
65
65
|
* Transforms the data coming from the `nls.metadata.json` file into a map.
|
|
@@ -76,7 +76,7 @@ class LocalizationKeyProvider {
|
|
|
76
76
|
for (const [fileKey, messageBundle] of Object.entries(messages)) {
|
|
77
77
|
const keyBundle = keys[fileKey];
|
|
78
78
|
for (let i = 0; i < messageBundle.length; i++) {
|
|
79
|
-
const message = localization_1.Localization.normalize(messageBundle[i]);
|
|
79
|
+
const message = localization_1.Localization.normalize(messageBundle[i]).toLowerCase();
|
|
80
80
|
const key = keyBundle[i];
|
|
81
81
|
const localizationKey = this.buildKey(typeof key === 'string' ? key : key.key, fileKey);
|
|
82
82
|
data.set(message, localizationKey);
|
package/lib/common/nls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nls.js","sourceRoot":"","sources":["../../src/common/nls.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,sDAA+D;AAE/D,IAAiB,GAAG,CAuCnB;AAvCD,WAAiB,GAAG;IAIH,YAAQ,GAAG,UAAU,CAAC;IAEtB,UAAM,GAAG,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAA,QAAQ,CAAC,IAAI,SAAS,CAAC;IAEjH,IAAI,WAAgD,CAAC;IAErD;;OAEG;IACH,SAAgB,iBAAiB,CAAC,YAAoB,EAAE,GAAG,IAAkB;QACzE,MAAM,GAAG,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"nls.js","sourceRoot":"","sources":["../../src/common/nls.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.24.0-next.
|
|
3
|
+
"version": "1.24.0-next.72+da55b6a4035",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
19
|
"@primer/octicons-react": "^9.0.0",
|
|
20
|
-
"@theia/application-package": "1.24.0-next.
|
|
20
|
+
"@theia/application-package": "1.24.0-next.72+da55b6a4035",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -190,5 +190,5 @@
|
|
|
190
190
|
"nyc": {
|
|
191
191
|
"extends": "../../configs/nyc.json"
|
|
192
192
|
},
|
|
193
|
-
"gitHead": "
|
|
193
|
+
"gitHead": "da55b6a40356d3b0e227dbc37d277f17f82fd170"
|
|
194
194
|
}
|
package/src/common/nls.ts
CHANGED
|
@@ -30,25 +30,25 @@ export namespace nls {
|
|
|
30
30
|
* Automatically localizes a text if that text also exists in the vscode repository.
|
|
31
31
|
*/
|
|
32
32
|
export function localizeByDefault(defaultValue: string, ...args: FormatType[]): string {
|
|
33
|
-
const key = getDefaultKey(defaultValue);
|
|
34
|
-
if (key) {
|
|
35
|
-
return localize(key, defaultValue, ...args);
|
|
36
|
-
}
|
|
37
|
-
return Localization.format(defaultValue, args);
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export function getDefaultKey(defaultValue: string): string {
|
|
41
33
|
if (localization) {
|
|
42
|
-
|
|
43
|
-
keyProvider = new LocalizationKeyProvider();
|
|
44
|
-
}
|
|
45
|
-
const key = keyProvider.get(defaultValue);
|
|
34
|
+
const key = getDefaultKey(defaultValue);
|
|
46
35
|
if (key) {
|
|
47
|
-
return key;
|
|
36
|
+
return localize(key, defaultValue, ...args);
|
|
48
37
|
} else {
|
|
49
38
|
console.warn(`Could not find translation key for default value: "${defaultValue}"`);
|
|
50
39
|
}
|
|
51
40
|
}
|
|
41
|
+
return Localization.format(defaultValue, args);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export function getDefaultKey(defaultValue: string): string {
|
|
45
|
+
if (!keyProvider) {
|
|
46
|
+
keyProvider = new LocalizationKeyProvider();
|
|
47
|
+
}
|
|
48
|
+
const key = keyProvider.get(defaultValue);
|
|
49
|
+
if (key) {
|
|
50
|
+
return key;
|
|
51
|
+
}
|
|
52
52
|
return '';
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -71,7 +71,7 @@ class LocalizationKeyProvider {
|
|
|
71
71
|
private data = this.buildData();
|
|
72
72
|
|
|
73
73
|
get(defaultValue: string): string | undefined {
|
|
74
|
-
return this.data.get(defaultValue);
|
|
74
|
+
return this.data.get(Localization.normalize(defaultValue.toLowerCase()));
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
/**
|
|
@@ -89,7 +89,7 @@ class LocalizationKeyProvider {
|
|
|
89
89
|
for (const [fileKey, messageBundle] of Object.entries(messages)) {
|
|
90
90
|
const keyBundle = keys[fileKey];
|
|
91
91
|
for (let i = 0; i < messageBundle.length; i++) {
|
|
92
|
-
const message = Localization.normalize(messageBundle[i]);
|
|
92
|
+
const message = Localization.normalize(messageBundle[i]).toLowerCase();
|
|
93
93
|
const key = keyBundle[i];
|
|
94
94
|
const localizationKey = this.buildKey(typeof key === 'string' ? key : key.key, fileKey);
|
|
95
95
|
data.set(message, localizationKey);
|