gt-next 5.2.37 → 5.2.39-alpha.0
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/CHANGELOG.md +9 -0
- package/dist/branches/Plural.d.ts +4 -4
- package/dist/branches/Plural.d.ts.map +1 -1
- package/dist/branches/Plural.js +7 -48
- package/dist/branches/Plural.js.map +1 -1
- package/dist/config-dir/DictionaryManager.js +2 -2
- package/dist/config-dir/DictionaryManager.js.map +1 -1
- package/dist/config-dir/I18NConfiguration.d.ts +1 -1
- package/dist/config-dir/I18NConfiguration.d.ts.map +1 -1
- package/dist/config-dir/I18NConfiguration.js +4 -5
- package/dist/config-dir/I18NConfiguration.js.map +1 -1
- package/dist/config-dir/TranslationManager.js +3 -3
- package/dist/config-dir/TranslationManager.js.map +1 -1
- package/dist/config.js +3 -3
- package/dist/config.js.map +1 -1
- package/dist/dictionary/getDictionary.d.ts.map +1 -1
- package/dist/dictionary/getDictionary.js +2 -2
- package/dist/dictionary/getDictionary.js.map +1 -1
- package/dist/errors/createErrors.js +5 -2
- package/dist/errors/createErrors.js.map +1 -1
- package/dist/index.client.d.ts +2 -2
- package/dist/index.client.d.ts.map +1 -1
- package/dist/index.client.js +1 -3
- package/dist/index.client.js.map +1 -1
- package/dist/index.server.d.ts +9 -2
- package/dist/index.server.d.ts.map +1 -1
- package/dist/index.server.js +25 -11
- package/dist/index.server.js.map +1 -1
- package/dist/index.types.d.ts +16 -35
- package/dist/index.types.d.ts.map +1 -1
- package/dist/index.types.js +16 -41
- package/dist/index.types.js.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +10 -6
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +13 -10
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/next/getNextLocale.js +2 -2
- package/dist/next/getNextLocale.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +6 -3
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/provider/GTProvider.js +2 -2
- package/dist/provider/GTProvider.js.map +1 -1
- package/dist/request/getLocale.d.ts +2 -1
- package/dist/request/getLocale.d.ts.map +1 -1
- package/dist/request/getLocale.js +6 -1
- package/dist/request/getLocale.js.map +1 -1
- package/dist/server-dir/buildtime/T.js +2 -2
- package/dist/server-dir/buildtime/T.js.map +1 -1
- package/dist/server-dir/buildtime/getGT.d.ts +11 -1
- package/dist/server-dir/buildtime/getGT.d.ts.map +1 -1
- package/dist/server-dir/buildtime/getGT.js +37 -27
- package/dist/server-dir/buildtime/getGT.js.map +1 -1
- package/dist/server-dir/buildtime/getTranslations.d.ts +16 -2
- package/dist/server-dir/buildtime/getTranslations.d.ts.map +1 -1
- package/dist/server-dir/buildtime/getTranslations.js +43 -18
- package/dist/server-dir/buildtime/getTranslations.js.map +1 -1
- package/dist/server-dir/runtime/_Tx.js +2 -2
- package/dist/server-dir/runtime/_Tx.js.map +1 -1
- package/dist/server-dir/runtime/tx.d.ts +1 -1
- package/dist/server-dir/runtime/tx.d.ts.map +1 -1
- package/dist/server-dir/runtime/tx.js +18 -16
- package/dist/server-dir/runtime/tx.js.map +1 -1
- package/dist/server.d.ts +5 -4
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +11 -7
- package/dist/server.js.map +1 -1
- package/dist/utils/use.d.ts +4 -0
- package/dist/utils/use.d.ts.map +1 -0
- package/dist/utils/use.js +73 -0
- package/dist/utils/use.js.map +1 -0
- package/dist/variables/Currency.d.ts +20 -3
- package/dist/variables/Currency.d.ts.map +1 -1
- package/dist/variables/Currency.js +29 -58
- package/dist/variables/Currency.js.map +1 -1
- package/dist/variables/DateTime.d.ts +20 -3
- package/dist/variables/DateTime.d.ts.map +1 -1
- package/dist/variables/DateTime.js +26 -70
- package/dist/variables/DateTime.js.map +1 -1
- package/dist/variables/Num.d.ts +6 -4
- package/dist/variables/Num.d.ts.map +1 -1
- package/dist/variables/Num.js +15 -59
- package/dist/variables/Num.js.map +1 -1
- package/package.json +4 -4
package/dist/index.server.js
CHANGED
|
@@ -3,7 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.useLocale = exports.useDict = exports.useTranslations = exports.useGT = exports.Plural = exports.Branch = exports.DateTime = exports.Currency = exports.Num = exports.Var = exports.Tx = exports.T = exports.GTProvider = exports.LocaleSelector = void 0;
|
|
7
|
+
exports.useGTClass = useGTClass;
|
|
8
|
+
exports.useLocaleProperties = useLocaleProperties;
|
|
9
|
+
exports.useLocales = useLocales;
|
|
10
|
+
exports.useDefaultLocale = useDefaultLocale;
|
|
7
11
|
var Var_1 = __importDefault(require("./variables/Var"));
|
|
8
12
|
exports.Var = Var_1.default;
|
|
9
13
|
var Num_1 = __importDefault(require("./variables/Num"));
|
|
@@ -22,16 +26,26 @@ var GTProvider_1 = __importDefault(require("./provider/GTProvider"));
|
|
|
22
26
|
exports.GTProvider = GTProvider_1.default;
|
|
23
27
|
var server_1 = require("./server");
|
|
24
28
|
Object.defineProperty(exports, "Tx", { enumerable: true, get: function () { return server_1.Tx; } });
|
|
29
|
+
var getGT_1 = require("./server-dir/buildtime/getGT");
|
|
30
|
+
Object.defineProperty(exports, "useGT", { enumerable: true, get: function () { return getGT_1.useGT; } });
|
|
31
|
+
var getTranslations_1 = require("./server-dir/buildtime/getTranslations");
|
|
32
|
+
Object.defineProperty(exports, "useTranslations", { enumerable: true, get: function () { return getTranslations_1.useTranslations; } });
|
|
33
|
+
Object.defineProperty(exports, "useDict", { enumerable: true, get: function () { return getTranslations_1.useTranslations; } });
|
|
34
|
+
var getLocale_1 = require("./request/getLocale");
|
|
35
|
+
Object.defineProperty(exports, "useLocale", { enumerable: true, get: function () { return getLocale_1.useLocale; } });
|
|
36
|
+
var getI18NConfig_1 = __importDefault(require("./config-dir/getI18NConfig"));
|
|
25
37
|
var index_client_1 = require("./index.client");
|
|
26
|
-
Object.defineProperty(exports, "useGT", { enumerable: true, get: function () { return index_client_1.useGT; } });
|
|
27
|
-
Object.defineProperty(exports, "useTranslations", { enumerable: true, get: function () { return index_client_1.useTranslations; } });
|
|
28
|
-
Object.defineProperty(exports, "useDict", { enumerable: true, get: function () { return index_client_1.useDict; } });
|
|
29
|
-
Object.defineProperty(exports, "useGTClass", { enumerable: true, get: function () { return index_client_1.useGTClass; } });
|
|
30
|
-
Object.defineProperty(exports, "useLocaleProperties", { enumerable: true, get: function () { return index_client_1.useLocaleProperties; } });
|
|
31
|
-
Object.defineProperty(exports, "useLocale", { enumerable: true, get: function () { return index_client_1.useLocale; } });
|
|
32
|
-
Object.defineProperty(exports, "useLocales", { enumerable: true, get: function () { return index_client_1.useLocales; } });
|
|
33
|
-
Object.defineProperty(exports, "useSetLocale", { enumerable: true, get: function () { return index_client_1.useSetLocale; } });
|
|
34
|
-
Object.defineProperty(exports, "useDefaultLocale", { enumerable: true, get: function () { return index_client_1.useDefaultLocale; } });
|
|
35
|
-
Object.defineProperty(exports, "useLocaleSelector", { enumerable: true, get: function () { return index_client_1.useLocaleSelector; } });
|
|
36
38
|
Object.defineProperty(exports, "LocaleSelector", { enumerable: true, get: function () { return index_client_1.LocaleSelector; } });
|
|
39
|
+
function useGTClass() {
|
|
40
|
+
return (0, getI18NConfig_1.default)().getGTClass();
|
|
41
|
+
}
|
|
42
|
+
function useLocaleProperties(locale) {
|
|
43
|
+
return useGTClass().getLocaleProperties(locale);
|
|
44
|
+
}
|
|
45
|
+
function useLocales() {
|
|
46
|
+
return (0, getI18NConfig_1.default)().getLocales();
|
|
47
|
+
}
|
|
48
|
+
function useDefaultLocale() {
|
|
49
|
+
return (0, getI18NConfig_1.default)().getDefaultLocale();
|
|
50
|
+
}
|
|
37
51
|
//# sourceMappingURL=index.server.js.map
|
package/dist/index.server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.server.js","sourceRoot":"","sources":["../src/index.server.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"index.server.js","sourceRoot":"","sources":["../src/index.server.ts"],"names":[],"mappings":";;;;;;AAgBA,gCAEC;AAED,kDAEC;AAED,gCAEC;AAED,4CAEC;AA9BD,wDAAkC;AAoChC,cApCK,aAAG,CAoCL;AAnCL,wDAAkC;AAoChC,cApCK,aAAG,CAoCL;AAnCL,kEAA4C;AAoC1C,mBApCK,kBAAQ,CAoCL;AAnCV,kEAA4C;AAoC1C,mBApCK,kBAAQ,CAoCL;AAnCV,+DAAyC;AA8BvC,YA9BK,WAAC,CA8BL;AA7BH,6DAAuC;AAmCrC,iBAnCK,gBAAM,CAmCL;AAlCR,6DAAuC;AAmCrC,iBAnCK,gBAAM,CAmCL;AAlCR,qEAA+C;AA0B7C,qBA1BK,oBAAU,CA0BL;AAzBZ,mCAA8B;AA2B5B,mFA3BO,WAAE,OA2BP;AA1BJ,sDAAqD;AAiCnD,sFAjCO,aAAK,OAiCP;AAhCP,0EAAyE;AAiCvE,gGAjCO,iCAAe,OAiCP;AACI,wFAlCZ,iCAAe,OAkCI;AAjC5B,iDAAgD;AAkC9C,0FAlCO,qBAAS,OAkCP;AAjCX,6EAAuD;AAEvD,+CAAgD;AAAvC,8GAAA,cAAc,OAAA;AAEvB,SAAgB,UAAU;IACxB,OAAO,IAAA,uBAAa,GAAE,CAAC,UAAU,EAAE,CAAC;AACtC,CAAC;AAED,SAAgB,mBAAmB,CAAC,MAAc;IAChD,OAAO,UAAU,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,UAAU;IACxB,OAAO,IAAA,uBAAa,GAAE,CAAC,UAAU,EAAE,CAAC;AACtC,CAAC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,IAAA,uBAAa,GAAE,CAAC,gBAAgB,EAAE,CAAC;AAC5C,CAAC"}
|
package/dist/index.types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _GTProvider from './provider/GTProvider';
|
|
2
2
|
import _T from './server-dir/buildtime/T';
|
|
3
|
-
import { useGT as _useGT, useTranslations as _useTranslations, useLocale as _useLocale, useLocales as _useLocales,
|
|
3
|
+
import { useGT as _useGT, useTranslations as _useTranslations, useLocale as _useLocale, useLocales as _useLocales, useDefaultLocale as _useDefaultLocale, useGTClass as _useGTClass, useLocaleProperties as _useLocaleProperties, Currency as _Currency, DateTime as _DateTime, Num as _Num, Var as _Var, Branch as _Branch, Plural as _Plural, LocaleSelector as _LocaleSelector } from 'gt-react/client';
|
|
4
4
|
/**
|
|
5
5
|
* Provides General Translation context to its children, which can then access `useGT`, `useLocale`, and `useDefaultLocale`.
|
|
6
6
|
*
|
|
@@ -152,9 +152,7 @@ export declare const Branch: typeof _Branch;
|
|
|
152
152
|
*
|
|
153
153
|
* @param {any} [children] - Fallback content to render if no matching plural branch is found.
|
|
154
154
|
* @param {number} [n] - The number used to determine the plural form. This is required for pluralization to work.
|
|
155
|
-
* @param {string} [locale] - Optional parameter, the locale to use for pluralization format.
|
|
156
|
-
* in <GTProvider> will automatically populate this value as user's current locale. If not provided and not wrapped in
|
|
157
|
-
* <GTProvider>, will use the library default locale (en-US).
|
|
155
|
+
* @param {string} [locale] - Optional parameter, the locale to use for pluralization format.
|
|
158
156
|
* @param {...{[key: string]: any}} [branches] - A spread object containing possible plural branches, typically including `one` for singular
|
|
159
157
|
* and `other` for plural forms, but it may vary depending on the locale.
|
|
160
158
|
* @returns {React.JSX.Element} The rendered content corresponding to the plural form of `n`, or the fallback content.
|
|
@@ -169,9 +167,9 @@ export declare const Plural: typeof _Plural;
|
|
|
169
167
|
*/
|
|
170
168
|
export declare const LocaleSelector: typeof _LocaleSelector;
|
|
171
169
|
/**
|
|
172
|
-
*
|
|
170
|
+
* Returns the string translation function `t`.
|
|
173
171
|
*
|
|
174
|
-
* @returns {Function} A translation function that accepts
|
|
172
|
+
* @returns {Function} A translation function that accepts an ICU format string and returns that ICU format string translated.
|
|
175
173
|
*
|
|
176
174
|
* @example
|
|
177
175
|
* const t = useGT();
|
|
@@ -187,7 +185,7 @@ export declare const LocaleSelector: typeof _LocaleSelector;
|
|
|
187
185
|
*/
|
|
188
186
|
export declare const useGT: typeof _useGT;
|
|
189
187
|
/**
|
|
190
|
-
*
|
|
188
|
+
* Returns the dictionary access function `t`.
|
|
191
189
|
*
|
|
192
190
|
* @param {string} [id] - Optional prefix to prepend to the translation keys.
|
|
193
191
|
* @returns {Function} A translation function that accepts a key string and returns the translated value.
|
|
@@ -201,24 +199,24 @@ export declare const useGT: typeof _useGT;
|
|
|
201
199
|
*/
|
|
202
200
|
export declare const useTranslations: typeof _useTranslations;
|
|
203
201
|
/**
|
|
204
|
-
*
|
|
205
|
-
* @deprecated Use useTranslations instead
|
|
202
|
+
* Returns the dictionary access function `d`.
|
|
203
|
+
* @deprecated Use the equivalent `useTranslations` function instead. `useDict` is supported as an alias.
|
|
206
204
|
*
|
|
207
205
|
* @param {string} [id] - Optional prefix to prepend to the translation keys.
|
|
208
206
|
* @returns {Function} A translation function that accepts a key string and returns the translated value.
|
|
209
207
|
*
|
|
210
208
|
* @example
|
|
211
209
|
* const d = useDict('user');
|
|
212
|
-
* console.log(
|
|
210
|
+
* console.log(d('name')); // Translates item 'user.name'
|
|
213
211
|
*
|
|
214
212
|
* const d = useDict();
|
|
215
|
-
* console.log(
|
|
213
|
+
* console.log(d('hello')); // Translates item 'hello'
|
|
216
214
|
*/
|
|
217
215
|
export declare const useDict: typeof _useTranslations;
|
|
218
216
|
/**
|
|
219
|
-
*
|
|
217
|
+
* Returns the user's current locale.
|
|
220
218
|
*
|
|
221
|
-
* @returns {string}
|
|
219
|
+
* @returns {string} BCP 47 locale tag, e.g., 'en-US'.
|
|
222
220
|
*
|
|
223
221
|
* @example
|
|
224
222
|
* const locale = useLocale();
|
|
@@ -226,9 +224,9 @@ export declare const useDict: typeof _useTranslations;
|
|
|
226
224
|
*/
|
|
227
225
|
export declare const useLocale: typeof _useLocale;
|
|
228
226
|
/**
|
|
229
|
-
*
|
|
227
|
+
* Returns the user's list of supported locales.
|
|
230
228
|
*
|
|
231
|
-
* @returns {string[]}
|
|
229
|
+
* @returns {string[]} List of BCP 47 locale tags, e.g., ['en-US', 'fr', 'jp'].
|
|
232
230
|
*
|
|
233
231
|
* @example
|
|
234
232
|
* const locales = useLocales();
|
|
@@ -236,34 +234,17 @@ export declare const useLocale: typeof _useLocale;
|
|
|
236
234
|
*/
|
|
237
235
|
export declare const useLocales: typeof _useLocales;
|
|
238
236
|
/**
|
|
239
|
-
*
|
|
240
|
-
* If the locale passed is not supported, will fallback on current locale and then defaultLocale if necessary.
|
|
241
|
-
* @note Unless a locale has explicitly been passed to the `<GTProvider>`, this will override the user's browser preferences. The locale passed to `<GTProvider>` will always take priority.
|
|
242
|
-
*
|
|
243
|
-
* @returns {(locale: string) => void} A function that sets the user's locale.
|
|
244
|
-
*
|
|
245
|
-
* @example
|
|
246
|
-
* setLocale('en-US');
|
|
247
|
-
*/
|
|
248
|
-
export declare const useSetLocale: typeof _useSetLocale;
|
|
249
|
-
/**
|
|
250
|
-
* Retrieves the application's default locale from the `<GTProvider>` context.
|
|
237
|
+
* Returns the application's default locale.
|
|
251
238
|
*
|
|
252
|
-
* If no default locale is
|
|
239
|
+
* If no default locale is provided, it defaults to 'en'.
|
|
253
240
|
*
|
|
254
|
-
* @returns {string}
|
|
241
|
+
* @returns {string} A BCP 47 locale tag, e.g., 'en-US'.
|
|
255
242
|
*
|
|
256
243
|
* @example
|
|
257
244
|
* const locale = useDefaultLocale();
|
|
258
245
|
* console.log(locale); // 'en-US'
|
|
259
246
|
*/
|
|
260
247
|
export declare const useDefaultLocale: typeof _useDefaultLocale;
|
|
261
|
-
/**
|
|
262
|
-
* Gets the list of properties for using a locale selector.
|
|
263
|
-
* @param locales an optional list of locales to use for the drop down. These locales must be a subset of the locales provided by the `<GTProvider>` context. When not provided, the list of locales from the `<GTProvider>` context is used.
|
|
264
|
-
* @returns {object} The locale, locales, and setLocale function.
|
|
265
|
-
*/
|
|
266
|
-
export declare const useLocaleSelector: typeof _useLocaleSelector;
|
|
267
248
|
/**
|
|
268
249
|
* Returns the configured GT class instance.
|
|
269
250
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.types.d.ts","sourceRoot":"","sources":["../src/index.types.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC1C,OAAO,EACL,KAAK,IAAI,MAAM,EACf,eAAe,IAAI,gBAAgB,EACnC,SAAS,IAAI,UAAU,EACvB,UAAU,IAAI,WAAW,EACzB,
|
|
1
|
+
{"version":3,"file":"index.types.d.ts","sourceRoot":"","sources":["../src/index.types.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC1C,OAAO,EACL,KAAK,IAAI,MAAM,EACf,eAAe,IAAI,gBAAgB,EACnC,SAAS,IAAI,UAAU,EACvB,UAAU,IAAI,WAAW,EACzB,gBAAgB,IAAI,iBAAiB,EACrC,UAAU,IAAI,WAAW,EACzB,mBAAmB,IAAI,oBAAoB,EAC3C,QAAQ,IAAI,SAAS,EACrB,QAAQ,IAAI,SAAS,EACrB,GAAG,IAAI,IAAI,EACX,GAAG,IAAI,IAAI,EACX,MAAM,IAAI,OAAO,EACjB,MAAM,IAAI,OAAO,EACjB,cAAc,IAAI,eAAe,EAClC,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,EAAE,OAAO,WAE/B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,eAAO,MAAM,CAAC,EAAE,OAAO,EAEtB,CAAC;AAGF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,SAE7B,CAAC;AAGF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,SAE7B,CAAC;AAGF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,GAAG,EAAE,OAAO,IAExB,CAAC;AAGF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,GAAG,EAAE,OAAO,IAExB,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,OAE3B,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,OAE3B,CAAC;AAGF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,OAAO,eAEnC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,KAAK,EAAE,OAAO,MAE1B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,EAAE,OAAO,gBAEpC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO,EAAE,OAAO,gBAE5B,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,EAAE,OAAO,UAE9B,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,EAAE,OAAO,WAE/B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,EAAE,OAAO,iBAErC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,EAAE,OAAO,WAE/B,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,EAAE,OAAO,oBAExC,CAAC"}
|
package/dist/index.types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useLocaleProperties = exports.useGTClass = exports.
|
|
3
|
+
exports.useLocaleProperties = exports.useGTClass = exports.useDefaultLocale = exports.useLocales = exports.useLocale = exports.useDict = exports.useTranslations = exports.useGT = exports.LocaleSelector = exports.Plural = exports.Branch = exports.Var = exports.Num = exports.DateTime = exports.Currency = exports.T = exports.GTProvider = void 0;
|
|
4
4
|
var createErrors_1 = require("./errors/createErrors");
|
|
5
5
|
/**
|
|
6
6
|
* Provides General Translation context to its children, which can then access `useGT`, `useLocale`, and `useDefaultLocale`.
|
|
@@ -180,9 +180,7 @@ exports.Branch.gtTransformation = 'branch-type';
|
|
|
180
180
|
*
|
|
181
181
|
* @param {any} [children] - Fallback content to render if no matching plural branch is found.
|
|
182
182
|
* @param {number} [n] - The number used to determine the plural form. This is required for pluralization to work.
|
|
183
|
-
* @param {string} [locale] - Optional parameter, the locale to use for pluralization format.
|
|
184
|
-
* in <GTProvider> will automatically populate this value as user's current locale. If not provided and not wrapped in
|
|
185
|
-
* <GTProvider>, will use the library default locale (en-US).
|
|
183
|
+
* @param {string} [locale] - Optional parameter, the locale to use for pluralization format.
|
|
186
184
|
* @param {...{[key: string]: any}} [branches] - A spread object containing possible plural branches, typically including `one` for singular
|
|
187
185
|
* and `other` for plural forms, but it may vary depending on the locale.
|
|
188
186
|
* @returns {React.JSX.Element} The rendered content corresponding to the plural form of `n`, or the fallback content.
|
|
@@ -204,9 +202,9 @@ var LocaleSelector = function () {
|
|
|
204
202
|
};
|
|
205
203
|
exports.LocaleSelector = LocaleSelector;
|
|
206
204
|
/**
|
|
207
|
-
*
|
|
205
|
+
* Returns the string translation function `t`.
|
|
208
206
|
*
|
|
209
|
-
* @returns {Function} A translation function that accepts
|
|
207
|
+
* @returns {Function} A translation function that accepts an ICU format string and returns that ICU format string translated.
|
|
210
208
|
*
|
|
211
209
|
* @example
|
|
212
210
|
* const t = useGT();
|
|
@@ -225,7 +223,7 @@ var useGT = function () {
|
|
|
225
223
|
};
|
|
226
224
|
exports.useGT = useGT;
|
|
227
225
|
/**
|
|
228
|
-
*
|
|
226
|
+
* Returns the dictionary access function `t`.
|
|
229
227
|
*
|
|
230
228
|
* @param {string} [id] - Optional prefix to prepend to the translation keys.
|
|
231
229
|
* @returns {Function} A translation function that accepts a key string and returns the translated value.
|
|
@@ -242,27 +240,27 @@ var useTranslations = function () {
|
|
|
242
240
|
};
|
|
243
241
|
exports.useTranslations = useTranslations;
|
|
244
242
|
/**
|
|
245
|
-
*
|
|
246
|
-
* @deprecated Use useTranslations instead
|
|
243
|
+
* Returns the dictionary access function `d`.
|
|
244
|
+
* @deprecated Use the equivalent `useTranslations` function instead. `useDict` is supported as an alias.
|
|
247
245
|
*
|
|
248
246
|
* @param {string} [id] - Optional prefix to prepend to the translation keys.
|
|
249
247
|
* @returns {Function} A translation function that accepts a key string and returns the translated value.
|
|
250
248
|
*
|
|
251
249
|
* @example
|
|
252
250
|
* const d = useDict('user');
|
|
253
|
-
* console.log(
|
|
251
|
+
* console.log(d('name')); // Translates item 'user.name'
|
|
254
252
|
*
|
|
255
253
|
* const d = useDict();
|
|
256
|
-
* console.log(
|
|
254
|
+
* console.log(d('hello')); // Translates item 'hello'
|
|
257
255
|
*/
|
|
258
256
|
var useDict = function () {
|
|
259
257
|
throw new Error(createErrors_1.typesFileError);
|
|
260
258
|
};
|
|
261
259
|
exports.useDict = useDict;
|
|
262
260
|
/**
|
|
263
|
-
*
|
|
261
|
+
* Returns the user's current locale.
|
|
264
262
|
*
|
|
265
|
-
* @returns {string}
|
|
263
|
+
* @returns {string} BCP 47 locale tag, e.g., 'en-US'.
|
|
266
264
|
*
|
|
267
265
|
* @example
|
|
268
266
|
* const locale = useLocale();
|
|
@@ -273,9 +271,9 @@ var useLocale = function () {
|
|
|
273
271
|
};
|
|
274
272
|
exports.useLocale = useLocale;
|
|
275
273
|
/**
|
|
276
|
-
*
|
|
274
|
+
* Returns the user's list of supported locales.
|
|
277
275
|
*
|
|
278
|
-
* @returns {string[]}
|
|
276
|
+
* @returns {string[]} List of BCP 47 locale tags, e.g., ['en-US', 'fr', 'jp'].
|
|
279
277
|
*
|
|
280
278
|
* @example
|
|
281
279
|
* const locales = useLocales();
|
|
@@ -286,25 +284,11 @@ var useLocales = function () {
|
|
|
286
284
|
};
|
|
287
285
|
exports.useLocales = useLocales;
|
|
288
286
|
/**
|
|
289
|
-
*
|
|
290
|
-
* If the locale passed is not supported, will fallback on current locale and then defaultLocale if necessary.
|
|
291
|
-
* @note Unless a locale has explicitly been passed to the `<GTProvider>`, this will override the user's browser preferences. The locale passed to `<GTProvider>` will always take priority.
|
|
292
|
-
*
|
|
293
|
-
* @returns {(locale: string) => void} A function that sets the user's locale.
|
|
294
|
-
*
|
|
295
|
-
* @example
|
|
296
|
-
* setLocale('en-US');
|
|
297
|
-
*/
|
|
298
|
-
var useSetLocale = function () {
|
|
299
|
-
throw new Error(createErrors_1.typesFileError);
|
|
300
|
-
};
|
|
301
|
-
exports.useSetLocale = useSetLocale;
|
|
302
|
-
/**
|
|
303
|
-
* Retrieves the application's default locale from the `<GTProvider>` context.
|
|
287
|
+
* Returns the application's default locale.
|
|
304
288
|
*
|
|
305
|
-
* If no default locale is
|
|
289
|
+
* If no default locale is provided, it defaults to 'en'.
|
|
306
290
|
*
|
|
307
|
-
* @returns {string}
|
|
291
|
+
* @returns {string} A BCP 47 locale tag, e.g., 'en-US'.
|
|
308
292
|
*
|
|
309
293
|
* @example
|
|
310
294
|
* const locale = useDefaultLocale();
|
|
@@ -314,15 +298,6 @@ var useDefaultLocale = function () {
|
|
|
314
298
|
throw new Error(createErrors_1.typesFileError);
|
|
315
299
|
};
|
|
316
300
|
exports.useDefaultLocale = useDefaultLocale;
|
|
317
|
-
/**
|
|
318
|
-
* Gets the list of properties for using a locale selector.
|
|
319
|
-
* @param locales an optional list of locales to use for the drop down. These locales must be a subset of the locales provided by the `<GTProvider>` context. When not provided, the list of locales from the `<GTProvider>` context is used.
|
|
320
|
-
* @returns {object} The locale, locales, and setLocale function.
|
|
321
|
-
*/
|
|
322
|
-
var useLocaleSelector = function () {
|
|
323
|
-
throw new Error(createErrors_1.typesFileError);
|
|
324
|
-
};
|
|
325
|
-
exports.useLocaleSelector = useLocaleSelector;
|
|
326
301
|
/**
|
|
327
302
|
* Returns the configured GT class instance.
|
|
328
303
|
*
|
package/dist/index.types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.types.js","sourceRoot":"","sources":["../src/index.types.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;
|
|
1
|
+
{"version":3,"file":"index.types.js","sourceRoot":"","sources":["../src/index.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOxD,OAAO,EACL,UAAU,EAOX,MAAM,SAAS,CAAC;AAKjB;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAoB,EACpB,mBAA2B,EAC3B,gBAAuB,EACvB,UAAe,GAChB,GAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;CACpB,SAyFqB,WAAW,2BA6MrC"}
|
|
@@ -10,9 +10,12 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
13
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
17
|
exports.default = createNextMiddleware;
|
|
15
|
-
var generaltranslation_1 = require("generaltranslation");
|
|
18
|
+
var generaltranslation_1 = __importDefault(require("generaltranslation"));
|
|
16
19
|
var internal_1 = require("generaltranslation/internal");
|
|
17
20
|
var createErrors_1 = require("../errors/createErrors");
|
|
18
21
|
var server_1 = require("next/server");
|
|
@@ -61,9 +64,9 @@ function createNextMiddleware(_a) {
|
|
|
61
64
|
var localeCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.localeCookieName) || internal_2.defaultLocaleCookieName;
|
|
62
65
|
var resetLocaleCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.resetLocaleCookieName) || cookies_1.defaultResetLocaleCookieName;
|
|
63
66
|
var localeHeaderName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.localeHeaderName) || headers_1.defaultLocaleHeaderName;
|
|
64
|
-
if (!
|
|
67
|
+
if (!generaltranslation_1.default.isValidLocale(defaultLocale))
|
|
65
68
|
throw new Error("gt-next middleware: defaultLocale \"".concat(defaultLocale, "\" is not a valid locale."));
|
|
66
|
-
var warningLocales = locales.filter(function (locale) { return !
|
|
69
|
+
var warningLocales = locales.filter(function (locale) { return !generaltranslation_1.default.isValidLocale(locale); });
|
|
67
70
|
if (warningLocales.length)
|
|
68
71
|
console.warn((0, createErrors_1.createUnsupportedLocalesWarning)(warningLocales));
|
|
69
72
|
var approvedLocales = locales;
|
|
@@ -77,7 +80,7 @@ function createNextMiddleware(_a) {
|
|
|
77
80
|
else {
|
|
78
81
|
acc[sharedPath] = Object.entries(localizedPath).reduce(function (acc, _a) {
|
|
79
82
|
var locale = _a[0], localizedPath = _a[1];
|
|
80
|
-
acc[gtServicesEnabled ?
|
|
83
|
+
acc[gtServicesEnabled ? generaltranslation_1.default.standardizeLocale(locale) : locale] =
|
|
81
84
|
localizedPath;
|
|
82
85
|
return acc;
|
|
83
86
|
}, {});
|
|
@@ -158,7 +161,8 @@ function createNextMiddleware(_a) {
|
|
|
158
161
|
// ----- CASE: no localized path exists ----- //
|
|
159
162
|
if (localizedPathWithParameters === undefined) {
|
|
160
163
|
// --- CASE: remove defaultLocale prefix --- //
|
|
161
|
-
if (!prefixDefaultLocale &&
|
|
164
|
+
if (!prefixDefaultLocale &&
|
|
165
|
+
generaltranslation_1.default.isSameDialect(userLocale, defaultLocale)) {
|
|
162
166
|
if (pathnameLocale) {
|
|
163
167
|
// REDIRECT CASE: used setLocale (/fr/customers -> /customers) (/en/customers -> /customers)
|
|
164
168
|
if (clearResetCookie) {
|
|
@@ -183,7 +187,7 @@ function createNextMiddleware(_a) {
|
|
|
183
187
|
return getNextResponse();
|
|
184
188
|
}
|
|
185
189
|
// ----- CASE: localized path exists ----- //
|
|
186
|
-
if (!prefixDefaultLocale &&
|
|
190
|
+
if (!prefixDefaultLocale && generaltranslation_1.default.isSameDialect(userLocale, defaultLocale)) {
|
|
187
191
|
// --- CASE: remove defaultLocale prefix --- //
|
|
188
192
|
if (pathnameLocale) {
|
|
189
193
|
// REDIRECT CASE: remove locale prefix when setLocale is used (/en/blog -> /blog) (/fr/fr-about -> /en-about)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,8BAA8B,EAAE,MAAM,CAAC;IACvC,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,WAAW,EACX,YAAmC,EACnC,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,8BAA8B,EAC9B,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,GACjB,EAAE,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,CAkCxC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG7D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GACnB,MAAM,CASR;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAapB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,MAAM,GACpB;IACD,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5C,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CA+BA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,oBAAoB,EAAE,MAAM,EAC5B,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC3C,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAqCpB;AA8BD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,WAAW,EAChB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,OAAO,EACtB,iBAAiB,EAAE,OAAO,EAC1B,mBAAmB,EAAE,OAAO,EAC5B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,wBAAwB,EAAE,MAAM,EAChC,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,GAC5B;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,4BAA4B,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAiHA"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.getResponse = getResponse;
|
|
4
7
|
exports.extractLocale = extractLocale;
|
|
@@ -9,7 +12,7 @@ exports.createPathToSharedPathMap = createPathToSharedPathMap;
|
|
|
9
12
|
exports.getSharedPath = getSharedPath;
|
|
10
13
|
exports.getLocaleFromRequest = getLocaleFromRequest;
|
|
11
14
|
var server_1 = require("next/server");
|
|
12
|
-
var generaltranslation_1 = require("generaltranslation");
|
|
15
|
+
var generaltranslation_1 = __importDefault(require("generaltranslation"));
|
|
13
16
|
function getResponse(_a) {
|
|
14
17
|
var type = _a.type, originalUrl = _a.originalUrl, _b = _a.responsePath, responsePath = _b === void 0 ? originalUrl.pathname : _b, userLocale = _a.userLocale, clearResetCookie = _a.clearResetCookie, headerList = _a.headerList, localeRouting = _a.localeRouting, localeRoutingEnabledCookieName = _a.localeRoutingEnabledCookieName, localeCookieName = _a.localeCookieName, resetLocaleCookieName = _a.resetLocaleCookieName, localeHeaderName = _a.localeHeaderName;
|
|
15
18
|
// Get Response
|
|
@@ -217,12 +220,12 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
217
220
|
if (localeRouting) {
|
|
218
221
|
unstandardizedPathnameLocale = extractLocale(pathname);
|
|
219
222
|
var extractedLocale = gtServicesEnabled
|
|
220
|
-
?
|
|
223
|
+
? generaltranslation_1.default.standardizeLocale(unstandardizedPathnameLocale || '')
|
|
221
224
|
: unstandardizedPathnameLocale;
|
|
222
225
|
if (extractedLocale &&
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
var determinedLocale =
|
|
226
|
+
generaltranslation_1.default.isValidLocale(extractedLocale) &&
|
|
227
|
+
generaltranslation_1.default.determineLocale([extractedLocale], approvedLocales)) {
|
|
228
|
+
var determinedLocale = generaltranslation_1.default.determineLocale([extractedLocale], approvedLocales);
|
|
226
229
|
if (determinedLocale) {
|
|
227
230
|
pathnameLocale = determinedLocale;
|
|
228
231
|
candidates.push(pathnameLocale);
|
|
@@ -238,7 +241,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
238
241
|
}
|
|
239
242
|
// Check cookie locale
|
|
240
243
|
var cookieLocale = req.cookies.get(localeCookieName);
|
|
241
|
-
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) &&
|
|
244
|
+
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && generaltranslation_1.default.isValidLocale(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
242
245
|
var resetCookie = req.cookies.get(resetLocaleCookieName);
|
|
243
246
|
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
244
247
|
// Add this back in when we support custom getLocale
|
|
@@ -255,10 +258,10 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
255
258
|
// Check referrer locale
|
|
256
259
|
var referrerLocaleCookie = req.cookies.get(referrerLocaleCookieName);
|
|
257
260
|
if ((referrerLocaleCookie === null || referrerLocaleCookie === void 0 ? void 0 : referrerLocaleCookie.value) &&
|
|
258
|
-
|
|
261
|
+
generaltranslation_1.default.isValidLocale(referrerLocaleCookie.value) &&
|
|
259
262
|
!clearResetCookie) {
|
|
260
263
|
var referrerLocale = referrerLocaleCookie.value;
|
|
261
|
-
if (
|
|
264
|
+
if (generaltranslation_1.default.determineLocale([referrerLocale], approvedLocales)) {
|
|
262
265
|
candidates.push(referrerLocale);
|
|
263
266
|
}
|
|
264
267
|
}
|
|
@@ -272,10 +275,10 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
272
275
|
// Get default locale
|
|
273
276
|
candidates.push(defaultLocale);
|
|
274
277
|
// determine userLocale
|
|
275
|
-
var unstandardizedUserLocale =
|
|
278
|
+
var unstandardizedUserLocale = generaltranslation_1.default.determineLocale(candidates.filter(generaltranslation_1.default.isValidLocale), approvedLocales) ||
|
|
276
279
|
defaultLocale;
|
|
277
280
|
var userLocale = gtServicesEnabled
|
|
278
|
-
?
|
|
281
|
+
? generaltranslation_1.default.standardizeLocale(unstandardizedUserLocale)
|
|
279
282
|
: unstandardizedUserLocale;
|
|
280
283
|
return {
|
|
281
284
|
userLocale: userLocale,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.getNextLocale = getNextLocale;
|
|
43
43
|
var headers_1 = require("next/headers");
|
|
44
|
-
var generaltranslation_1 = require("generaltranslation");
|
|
44
|
+
var generaltranslation_1 = __importDefault(require("generaltranslation"));
|
|
45
45
|
var getI18NConfig_1 = __importDefault(require("../config-dir/getI18NConfig"));
|
|
46
46
|
/**
|
|
47
47
|
* Retrieves the 'accept-language' header from the headers list.
|
|
@@ -83,7 +83,7 @@ function getNextLocale() {
|
|
|
83
83
|
}
|
|
84
84
|
// add defaultLocale just in case there are no matches
|
|
85
85
|
preferredLocales.push(defaultLocale);
|
|
86
|
-
return
|
|
86
|
+
return generaltranslation_1.default.determineLocale(preferredLocales, locales) || defaultLocale;
|
|
87
87
|
})();
|
|
88
88
|
return [2 /*return*/, userLocale];
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNextLocale.js","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,sCAsCC;AAnDD,wCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"getNextLocale.js","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,sCAsCC;AAnDD,wCAAgD;AAChD,0EAAoC;AACpC,8EAAwD;AAExD;;;;;;;;GAQG;AACH,SAAsB,aAAa;wDACjC,aAA0B,EAC1B,OAAiB;;QADjB,8BAAA,EAAA,kBAA0B;;;wBAGS,qBAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,iBAAO,GAAE,EAAE,IAAA,iBAAO,GAAE,CAAC,CAAC,EAAA;;oBAAtE,KAA6B,SAAyC,EAArE,WAAW,QAAA,EAAE,WAAW,QAAA;oBAEzB,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBAE7B,UAAU,GAAG,CAAC;;wBAClB,IAAM,gBAAgB,GAAa,EAAE,CAAC;wBAEtC,mCAAmC;wBACnC,IAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;wBACvE,IAAI,YAAY,EAAE,CAAC;4BACjB,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;wBACtC,CAAC;wBACD,IAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;wBACvE,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,EAAE,CAAC;4BACxB,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;wBAC5C,CAAC;wBAED,yCAAyC;wBACzC,IAAI,OAAO,CAAC,GAAG,CAAC,0CAA0C,KAAK,OAAO,EAAE,CAAC;4BACvE,IAAM,eAAe,GAAG,MAAA,WAAW;iCAChC,GAAG,CAAC,iBAAiB,CAAC,0CACrB,KAAK,CAAC,GAAG,EACV,GAAG,CAAC,UAAC,IAAI,YAAK,OAAA,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,0CAAG,CAAC,EAAE,IAAI,EAAE,CAAA,EAAA,CAAC,CAAC;4BAE9C,IAAI,eAAe;gCAAE,gBAAgB,CAAC,IAAI,OAArB,gBAAgB,EAAS,eAAe,EAAE;wBACjE,CAAC;wBAED,sDAAsD;wBACtD,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAErC,OAAO,4BAAE,CAAC,eAAe,CAAC,gBAAgB,EAAE,OAAO,CAAC,IAAI,aAAa,CAAC;oBACxE,CAAC,CAAC,EAAE,CAAC;oBAEL,sBAAO,UAAU,EAAC;;;;CACnB"}
|