gt-next 5.2.22 → 5.2.23-alpha.1
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/config-dir/DictionaryManager.d.ts +36 -7
- package/dist/config-dir/DictionaryManager.d.ts.map +1 -1
- package/dist/config-dir/DictionaryManager.js +180 -47
- package/dist/config-dir/DictionaryManager.js.map +1 -1
- package/dist/config-dir/I18NConfiguration.d.ts +11 -5
- package/dist/config-dir/I18NConfiguration.d.ts.map +1 -1
- package/dist/config-dir/I18NConfiguration.js +24 -7
- package/dist/config-dir/I18NConfiguration.js.map +1 -1
- package/dist/config-dir/TranslationManager.d.ts +0 -6
- package/dist/config-dir/TranslationManager.d.ts.map +1 -1
- package/dist/config-dir/TranslationManager.js +17 -31
- package/dist/config-dir/TranslationManager.js.map +1 -1
- package/dist/dictionary/getDictionary.d.ts +5 -0
- package/dist/dictionary/getDictionary.d.ts.map +1 -1
- package/dist/dictionary/getDictionary.js +7 -3
- package/dist/dictionary/getDictionary.js.map +1 -1
- package/dist/errors/createErrors.d.ts +7 -1
- package/dist/errors/createErrors.d.ts.map +1 -1
- package/dist/errors/createErrors.js +21 -3
- package/dist/errors/createErrors.js.map +1 -1
- package/dist/loaders/resolveDictionaryDictionary.js +1 -1
- package/dist/next/getNextLocale.d.ts.map +1 -1
- package/dist/next/getNextLocale.js +8 -1
- package/dist/next/getNextLocale.js.map +1 -1
- package/dist/provider/GTProvider.d.ts.map +1 -1
- package/dist/provider/GTProvider.js +23 -76
- package/dist/provider/GTProvider.js.map +1 -1
- package/dist/server-dir/buildtime/getDict.d.ts.map +1 -1
- package/dist/server-dir/buildtime/getDict.js +41 -43
- package/dist/server-dir/buildtime/getDict.js.map +1 -1
- package/package.json +2 -2
|
@@ -52,7 +52,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
52
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
53
|
exports.default = getDict;
|
|
54
54
|
var internal_1 = require("gt-react/internal");
|
|
55
|
-
var getDictionary_1 = __importDefault(require("../../dictionary/getDictionary"));
|
|
56
55
|
var createErrors_1 = require("../../errors/createErrors");
|
|
57
56
|
var getI18NConfig_1 = __importDefault(require("../../config-dir/getI18NConfig"));
|
|
58
57
|
var getLocale_1 = __importDefault(require("../../request/getLocale"));
|
|
@@ -73,48 +72,39 @@ var id_1 = require("generaltranslation/id");
|
|
|
73
72
|
*/
|
|
74
73
|
function getDict(id) {
|
|
75
74
|
return __awaiter(this, void 0, void 0, function () {
|
|
76
|
-
var getId,
|
|
77
|
-
return __generator(this, function (
|
|
78
|
-
switch (
|
|
75
|
+
var getId, locale, I18NConfig, defaultLocale, translationRequired, renderSettings, cachedTranslationsPromise, defaultDictionaryPromise, translationDictionaryPromise, _a, translations, defaultDictionary, translationsDictionary, d;
|
|
76
|
+
return __generator(this, function (_b) {
|
|
77
|
+
switch (_b.label) {
|
|
79
78
|
case 0:
|
|
80
79
|
getId = function (suffix) {
|
|
81
80
|
return id ? "".concat(id, ".").concat(suffix) : suffix;
|
|
82
81
|
};
|
|
83
|
-
return [4 /*yield*/, (0,
|
|
82
|
+
return [4 /*yield*/, (0, getLocale_1.default)()];
|
|
84
83
|
case 1:
|
|
85
|
-
|
|
84
|
+
locale = _b.sent();
|
|
86
85
|
I18NConfig = (0, getI18NConfig_1.default)();
|
|
87
|
-
return [4 /*yield*/, (0, getLocale_1.default)()];
|
|
88
|
-
case 2:
|
|
89
|
-
locale = _c.sent();
|
|
90
86
|
defaultLocale = I18NConfig.getDefaultLocale();
|
|
91
87
|
translationRequired = I18NConfig.requiresTranslation(locale)[0];
|
|
92
|
-
if (!translationRequired) return [3 /*break*/, 4];
|
|
93
|
-
return [4 /*yield*/, I18NConfig.getDictionaryTranslations(locale)];
|
|
94
|
-
case 3:
|
|
95
|
-
_a = _c.sent();
|
|
96
|
-
return [3 /*break*/, 5];
|
|
97
|
-
case 4:
|
|
98
|
-
_a = undefined;
|
|
99
|
-
_c.label = 5;
|
|
100
|
-
case 5:
|
|
101
|
-
dictionaryTranslations = _a;
|
|
102
|
-
if (!translationRequired) return [3 /*break*/, 7];
|
|
103
|
-
return [4 /*yield*/, I18NConfig.getCachedTranslations(locale)];
|
|
104
|
-
case 6:
|
|
105
|
-
_b = _c.sent();
|
|
106
|
-
return [3 /*break*/, 8];
|
|
107
|
-
case 7:
|
|
108
|
-
_b = undefined;
|
|
109
|
-
_c.label = 8;
|
|
110
|
-
case 8:
|
|
111
|
-
translations = _b;
|
|
112
88
|
renderSettings = I18NConfig.getRenderSettings();
|
|
89
|
+
cachedTranslationsPromise = translationRequired
|
|
90
|
+
? I18NConfig.getCachedTranslations(locale)
|
|
91
|
+
: {};
|
|
92
|
+
defaultDictionaryPromise = I18NConfig.getDictionary(defaultLocale, id);
|
|
93
|
+
translationDictionaryPromise = translationRequired
|
|
94
|
+
? I18NConfig.getDictionary(locale, id)
|
|
95
|
+
: Promise.resolve({});
|
|
96
|
+
return [4 /*yield*/, Promise.all([
|
|
97
|
+
cachedTranslationsPromise,
|
|
98
|
+
defaultDictionaryPromise,
|
|
99
|
+
translationDictionaryPromise,
|
|
100
|
+
])];
|
|
101
|
+
case 2:
|
|
102
|
+
_a = _b.sent(), translations = _a[0], defaultDictionary = _a[1], translationsDictionary = _a[2];
|
|
113
103
|
d = function (id, options) {
|
|
114
104
|
if (options === void 0) { options = {}; }
|
|
115
105
|
// Get entry
|
|
116
106
|
id = getId(id);
|
|
117
|
-
var value =
|
|
107
|
+
var value = defaultDictionary === null || defaultDictionary === void 0 ? void 0 : defaultDictionary[id];
|
|
118
108
|
// Check: no entry found
|
|
119
109
|
if (!value) {
|
|
120
110
|
console.warn((0, createErrors_1.createNoEntryFoundWarning)(id));
|
|
@@ -139,25 +129,33 @@ function getDict(id) {
|
|
|
139
129
|
// Check: translation required
|
|
140
130
|
if (!translationRequired)
|
|
141
131
|
return renderContent(source, [defaultLocale]);
|
|
142
|
-
//
|
|
132
|
+
// ----- CHECK DICTIONARY ----- //
|
|
143
133
|
// Get dictionaryTranslation
|
|
144
|
-
var dictionaryTranslation =
|
|
145
|
-
//
|
|
146
|
-
if (dictionaryTranslation) {
|
|
147
|
-
|
|
134
|
+
var dictionaryTranslation = translationsDictionary === null || translationsDictionary === void 0 ? void 0 : translationsDictionary[id];
|
|
135
|
+
// Check: valid entry
|
|
136
|
+
if ((0, internal_1.isValidDictionaryEntry)(dictionaryTranslation)) {
|
|
137
|
+
// Get entry and metadata
|
|
138
|
+
var entry_1 = (0, internal_1.getEntryAndMetadata)(dictionaryTranslation).entry;
|
|
139
|
+
// Render translation
|
|
140
|
+
return renderContent(entry_1, [locale, defaultLocale]);
|
|
148
141
|
}
|
|
149
|
-
//
|
|
142
|
+
// ----- CHECK TRANSLATIONS ----- //
|
|
143
|
+
// Get hash
|
|
150
144
|
var hash = (0, id_1.hashJsxChildren)(__assign(__assign({ source: source }, ((metadata === null || metadata === void 0 ? void 0 : metadata.context) && { context: metadata === null || metadata === void 0 ? void 0 : metadata.context })), { id: id, dataFormat: 'JSX' }));
|
|
145
|
+
// Check id first
|
|
151
146
|
var translationEntry = translations === null || translations === void 0 ? void 0 : translations[hash];
|
|
152
|
-
//
|
|
153
|
-
// If a translation already exists
|
|
147
|
+
// Check translation successful
|
|
154
148
|
if ((translationEntry === null || translationEntry === void 0 ? void 0 : translationEntry.state) === 'success')
|
|
155
|
-
return renderContent(translationEntry.target, [
|
|
156
|
-
|
|
157
|
-
|
|
149
|
+
return renderContent(translationEntry.target, [
|
|
150
|
+
locale,
|
|
151
|
+
defaultLocale,
|
|
152
|
+
]);
|
|
153
|
+
// Check translation errored
|
|
154
|
+
if ((translationEntry === null || translationEntry === void 0 ? void 0 : translationEntry.state) === 'error') {
|
|
158
155
|
return renderContent(source, [defaultLocale]);
|
|
159
|
-
|
|
160
|
-
//
|
|
156
|
+
}
|
|
157
|
+
// ----- TRANSLATE ON DEMAND ----- //
|
|
158
|
+
// develoment only
|
|
161
159
|
if (!I18NConfig.isDevelopmentApiEnabled()) {
|
|
162
160
|
console.warn((0, createErrors_1.createDictionaryTranslationError)(id));
|
|
163
161
|
return renderContent(source, [defaultLocale]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDict.js","sourceRoot":"","sources":["../../../src/server-dir/buildtime/getDict.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"getDict.js","sourceRoot":"","sources":["../../../src/server-dir/buildtime/getDict.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "5.2.
|
|
3
|
+
"version": "5.2.23-alpha.1",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@generaltranslation/supported-locales": "^2.0.7",
|
|
13
13
|
"generaltranslation": "^6.2.2",
|
|
14
|
-
"gt-react": "^9.2.
|
|
14
|
+
"gt-react": "^9.2.17-alpha.1"
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"patch": "npm version patch",
|