gettext-universal 1.0.22 → 1.0.24
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/build/src/config.d.ts
CHANGED
|
@@ -11,6 +11,14 @@ declare class Config {
|
|
|
11
11
|
};
|
|
12
12
|
}): void;
|
|
13
13
|
getFallbacks(): string[] | undefined;
|
|
14
|
+
/**
|
|
15
|
+
* Returns the active locale. If `setLocale` was called with a
|
|
16
|
+
* function (a resolver), the resolver is invoked here so callers
|
|
17
|
+
* always receive a string — this lets apps plumb a per-request
|
|
18
|
+
* locale through AsyncLocalStorage (or similar) transparently.
|
|
19
|
+
*
|
|
20
|
+
* @returns {string | undefined}
|
|
21
|
+
*/
|
|
14
22
|
getLocale(): string | undefined;
|
|
15
23
|
getLocales(): Record<string, Record<string, any>>;
|
|
16
24
|
/**
|
|
@@ -20,10 +28,14 @@ declare class Config {
|
|
|
20
28
|
setFallbacks(fallbacks: string[]): void;
|
|
21
29
|
fallbacks: string[] | undefined;
|
|
22
30
|
/**
|
|
23
|
-
*
|
|
31
|
+
* Sets the active locale. Accepts a string (global/static locale)
|
|
32
|
+
* OR a function that returns the current locale on each call
|
|
33
|
+
* (useful for per-request locale backed by AsyncLocalStorage).
|
|
34
|
+
*
|
|
35
|
+
* @param {string | (() => string | undefined)} locale
|
|
24
36
|
* @returns {void}
|
|
25
37
|
*/
|
|
26
|
-
setLocale(locale: string): void;
|
|
27
|
-
locale: string | undefined;
|
|
38
|
+
setLocale(locale: string | (() => string | undefined)): void;
|
|
39
|
+
locale: string | (() => string | undefined) | undefined;
|
|
28
40
|
}
|
|
29
41
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.js"],"names":[],"mappings":";AAuEA,6BAA2B;AAnE3B;IAEI,kDAAkD;IAClD,SADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAC7B;IAGnB,oGAAoG;IACpG,mDADY;QAAC,IAAI,EAAE,MAAM,MAAM,EAAE,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG;YAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;SAAC,CAAA;KAAC,QAchF;IAED,qCAAwC;IAExC;;;;;;;OAOG;IACH,aAFa,MAAM,GAAG,SAAS,CAK9B;IAED,kDAAoC;IAEpC;;;OAGG;IACH,wBAHW,MAAM,EAAE,GACN,IAAI,CAIhB;IADC,gCAA0B;IAG5B;;;;;;;OAOG;IACH,kBAHW,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,GACjC,IAAI,CAWhB;IARC,wBAJyB,MAAM,GAAG,SAAS,cAIvB;CASvB"}
|
package/build/src/config.js
CHANGED
|
@@ -18,7 +18,19 @@ class Config {
|
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
getFallbacks() { return this.fallbacks; }
|
|
21
|
-
|
|
21
|
+
/**
|
|
22
|
+
* Returns the active locale. If `setLocale` was called with a
|
|
23
|
+
* function (a resolver), the resolver is invoked here so callers
|
|
24
|
+
* always receive a string — this lets apps plumb a per-request
|
|
25
|
+
* locale through AsyncLocalStorage (or similar) transparently.
|
|
26
|
+
*
|
|
27
|
+
* @returns {string | undefined}
|
|
28
|
+
*/
|
|
29
|
+
getLocale() {
|
|
30
|
+
if (typeof this.locale === "function")
|
|
31
|
+
return this.locale();
|
|
32
|
+
return this.locale;
|
|
33
|
+
}
|
|
22
34
|
getLocales() { return this.locales; }
|
|
23
35
|
/**
|
|
24
36
|
* @param {string[]} fallbacks
|
|
@@ -28,14 +40,23 @@ class Config {
|
|
|
28
40
|
this.fallbacks = fallbacks;
|
|
29
41
|
}
|
|
30
42
|
/**
|
|
31
|
-
*
|
|
43
|
+
* Sets the active locale. Accepts a string (global/static locale)
|
|
44
|
+
* OR a function that returns the current locale on each call
|
|
45
|
+
* (useful for per-request locale backed by AsyncLocalStorage).
|
|
46
|
+
*
|
|
47
|
+
* @param {string | (() => string | undefined)} locale
|
|
32
48
|
* @returns {void}
|
|
33
49
|
*/
|
|
34
50
|
setLocale(locale) {
|
|
35
51
|
this.locale = locale;
|
|
36
|
-
|
|
52
|
+
// Only emit for static locales. Function resolvers return a
|
|
53
|
+
// per-request locale dynamically — emitting undefined would
|
|
54
|
+
// mislead listeners into thinking the locale was cleared.
|
|
55
|
+
if (typeof locale !== "function") {
|
|
56
|
+
events.emit("onLocaleChange", { locale });
|
|
57
|
+
}
|
|
37
58
|
}
|
|
38
59
|
}
|
|
39
60
|
const config = new Config();
|
|
40
61
|
export default config;
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxZQUFZO0FBRVosT0FBTyxNQUFNLE1BQU0sYUFBYSxDQUFBO0FBRWhDLE1BQU0sTUFBTTtJQUNWO1FBQ0Usa0RBQWtEO1FBQ2xELElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFBO0lBQ25CLENBQUM7SUFFRCxvR0FBb0c7SUFDcEcsa0NBQWtDLENBQUMsY0FBYztRQUMvQyxLQUFLLE1BQU0sVUFBVSxJQUFJLGNBQWMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDO1lBQy9DLE1BQU0sS0FBSyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtZQUVoRCxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ1gsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQ0FBcUMsVUFBVSxFQUFFLENBQUMsQ0FBQTtZQUNwRSxDQUFDO1lBRUQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ3ZCLE1BQU0sWUFBWSxHQUFHLGNBQWMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxPQUFPLENBQUE7WUFFdkQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxZQUFZLENBQUE7UUFDckMsQ0FBQztJQUNILENBQUM7SUFFRCxZQUFZLEtBQUssT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFBLENBQUMsQ0FBQztJQUV4Qzs7Ozs7OztPQU9HO0lBQ0gsU0FBUztRQUNQLElBQUksT0FBTyxJQUFJLENBQUMsTUFBTSxLQUFLLFVBQVU7WUFBRSxPQUFPLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQTtRQUMzRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUE7SUFDcEIsQ0FBQztJQUVELFVBQVUsS0FBSyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUEsQ0FBQyxDQUFDO0lBRXBDOzs7T0FHRztJQUNILFlBQVksQ0FBQyxTQUFTO1FBQ3BCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFBO0lBQzVCLENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsU0FBUyxDQUFDLE1BQU07UUFDZCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtRQUVwQiw0REFBNEQ7UUFDNUQsNERBQTREO1FBQzVELDBEQUEwRDtRQUMxRCxJQUFJLE9BQU8sTUFBTSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ2pDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsRUFBQyxNQUFNLEVBQUMsQ0FBQyxDQUFBO1FBQ3pDLENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLE1BQU0sRUFBRSxDQUFBO0FBRTNCLGVBQWUsTUFBTSxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQHRzLWNoZWNrXG5cbmltcG9ydCBldmVudHMgZnJvbSBcIi4vZXZlbnRzLmpzXCJcblxuY2xhc3MgQ29uZmlnIHtcbiAgY29uc3RydWN0b3IoKSB7XG4gICAgLyoqIEB0eXBlIHtSZWNvcmQ8c3RyaW5nLCBSZWNvcmQ8c3RyaW5nLCBhbnk+Pn0gKi9cbiAgICB0aGlzLmxvY2FsZXMgPSB7fVxuICB9XG5cbiAgLyoqIEBwYXJhbSB7e2tleXM6ICgpID0+IHN0cmluZ1tdLCAoa2V5OiBzdHJpbmcpOiB7ZGVmYXVsdDogUmVjb3JkPHN0cmluZywgYW55Pn19fSByZXF1aXJlQ29udGV4dCAqL1xuICBsb2FkVHJhbnNsYXRpb25zRnJvbVJlcXVpcmVDb250ZXh0KHJlcXVpcmVDb250ZXh0KSB7XG4gICAgZm9yIChjb25zdCBsb2NhbGVGaWxlIG9mIHJlcXVpcmVDb250ZXh0LmtleXMoKSkge1xuICAgICAgY29uc3QgbWF0Y2ggPSBsb2NhbGVGaWxlLm1hdGNoKC8oW2Etel17Mn0pLmpzJC8pXG5cbiAgICAgIGlmICghbWF0Y2gpIHtcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBDb3VsZG4ndCBkZXRlY3QgbG9jYWxlIGZyb20gZmlsZTogJHtsb2NhbGVGaWxlfWApXG4gICAgICB9XG5cbiAgICAgIGNvbnN0IGxvY2FsZSA9IG1hdGNoWzFdXG4gICAgICBjb25zdCB0cmFuc2xhdGlvbnMgPSByZXF1aXJlQ29udGV4dChsb2NhbGVGaWxlKS5kZWZhdWx0XG5cbiAgICAgIHRoaXMubG9jYWxlc1tsb2NhbGVdID0gdHJhbnNsYXRpb25zXG4gICAgfVxuICB9XG5cbiAgZ2V0RmFsbGJhY2tzKCkgeyByZXR1cm4gdGhpcy5mYWxsYmFja3MgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm5zIHRoZSBhY3RpdmUgbG9jYWxlLiBJZiBgc2V0TG9jYWxlYCB3YXMgY2FsbGVkIHdpdGggYVxuICAgKiBmdW5jdGlvbiAoYSByZXNvbHZlciksIHRoZSByZXNvbHZlciBpcyBpbnZva2VkIGhlcmUgc28gY2FsbGVyc1xuICAgKiBhbHdheXMgcmVjZWl2ZSBhIHN0cmluZyDigJQgdGhpcyBsZXRzIGFwcHMgcGx1bWIgYSBwZXItcmVxdWVzdFxuICAgKiBsb2NhbGUgdGhyb3VnaCBBc3luY0xvY2FsU3RvcmFnZSAob3Igc2ltaWxhcikgdHJhbnNwYXJlbnRseS5cbiAgICpcbiAgICogQHJldHVybnMge3N0cmluZyB8IHVuZGVmaW5lZH1cbiAgICovXG4gIGdldExvY2FsZSgpIHtcbiAgICBpZiAodHlwZW9mIHRoaXMubG9jYWxlID09PSBcImZ1bmN0aW9uXCIpIHJldHVybiB0aGlzLmxvY2FsZSgpXG4gICAgcmV0dXJuIHRoaXMubG9jYWxlXG4gIH1cblxuICBnZXRMb2NhbGVzKCkgeyByZXR1cm4gdGhpcy5sb2NhbGVzIH1cblxuICAvKipcbiAgICogQHBhcmFtIHtzdHJpbmdbXX0gZmFsbGJhY2tzXG4gICAqIEByZXR1cm5zIHt2b2lkfVxuICAgKi9cbiAgc2V0RmFsbGJhY2tzKGZhbGxiYWNrcykge1xuICAgIHRoaXMuZmFsbGJhY2tzID0gZmFsbGJhY2tzXG4gIH1cblxuICAvKipcbiAgICogU2V0cyB0aGUgYWN0aXZlIGxvY2FsZS4gQWNjZXB0cyBhIHN0cmluZyAoZ2xvYmFsL3N0YXRpYyBsb2NhbGUpXG4gICAqIE9SIGEgZnVuY3Rpb24gdGhhdCByZXR1cm5zIHRoZSBjdXJyZW50IGxvY2FsZSBvbiBlYWNoIGNhbGxcbiAgICogKHVzZWZ1bCBmb3IgcGVyLXJlcXVlc3QgbG9jYWxlIGJhY2tlZCBieSBBc3luY0xvY2FsU3RvcmFnZSkuXG4gICAqXG4gICAqIEBwYXJhbSB7c3RyaW5nIHwgKCgpID0+IHN0cmluZyB8IHVuZGVmaW5lZCl9IGxvY2FsZVxuICAgKiBAcmV0dXJucyB7dm9pZH1cbiAgICovXG4gIHNldExvY2FsZShsb2NhbGUpIHtcbiAgICB0aGlzLmxvY2FsZSA9IGxvY2FsZVxuXG4gICAgLy8gT25seSBlbWl0IGZvciBzdGF0aWMgbG9jYWxlcy4gRnVuY3Rpb24gcmVzb2x2ZXJzIHJldHVybiBhXG4gICAgLy8gcGVyLXJlcXVlc3QgbG9jYWxlIGR5bmFtaWNhbGx5IOKAlCBlbWl0dGluZyB1bmRlZmluZWQgd291bGRcbiAgICAvLyBtaXNsZWFkIGxpc3RlbmVycyBpbnRvIHRoaW5raW5nIHRoZSBsb2NhbGUgd2FzIGNsZWFyZWQuXG4gICAgaWYgKHR5cGVvZiBsb2NhbGUgIT09IFwiZnVuY3Rpb25cIikge1xuICAgICAgZXZlbnRzLmVtaXQoXCJvbkxvY2FsZUNoYW5nZVwiLCB7bG9jYWxlfSlcbiAgICB9XG4gIH1cbn1cblxuY29uc3QgY29uZmlnID0gbmV3IENvbmZpZygpXG5cbmV4cG9ydCBkZWZhdWx0IGNvbmZpZ1xuIl19
|
|
@@ -16,10 +16,16 @@
|
|
|
16
16
|
* via refs, so a settings picker that calls `setLocale` stays in effect
|
|
17
17
|
* across re-renders.
|
|
18
18
|
*
|
|
19
|
-
* Returns
|
|
20
|
-
*
|
|
19
|
+
* Returns the currently active locale string from `config.getLocale()`
|
|
20
|
+
* (or `undefined` when no locale has been set yet) so callers can pass
|
|
21
|
+
* it as a `useEffect` dependency. The hook's own `setTick` subscription
|
|
22
|
+
* to `onLocaleChange` makes the return value reactive — including
|
|
23
|
+
* imperative `config.setLocale(...)` calls from a settings picker that
|
|
24
|
+
* does not also push through `TranslateContext`. For the callable-
|
|
25
|
+
* translator pattern, keep using `useTranslate()` / `useTranslateExpo()`
|
|
26
|
+
* — both hooks remain available.
|
|
21
27
|
*
|
|
22
|
-
* @returns {
|
|
28
|
+
* @returns {string | undefined}
|
|
23
29
|
*/
|
|
24
|
-
export default function useLocaleExpo():
|
|
30
|
+
export default function useLocaleExpo(): string | undefined;
|
|
25
31
|
//# sourceMappingURL=use-locale-expo.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-locale-expo.d.ts","sourceRoot":"","sources":["../../src/use-locale-expo.js"],"names":[],"mappings":"AAQA
|
|
1
|
+
{"version":3,"file":"use-locale-expo.d.ts","sourceRoot":"","sources":["../../src/use-locale-expo.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,yCAFa,MAAM,GAAG,SAAS,CAwE9B"}
|
|
@@ -22,10 +22,16 @@ import TranslateContext from "./translate-context.js";
|
|
|
22
22
|
* via refs, so a settings picker that calls `setLocale` stays in effect
|
|
23
23
|
* across re-renders.
|
|
24
24
|
*
|
|
25
|
-
* Returns
|
|
26
|
-
*
|
|
25
|
+
* Returns the currently active locale string from `config.getLocale()`
|
|
26
|
+
* (or `undefined` when no locale has been set yet) so callers can pass
|
|
27
|
+
* it as a `useEffect` dependency. The hook's own `setTick` subscription
|
|
28
|
+
* to `onLocaleChange` makes the return value reactive — including
|
|
29
|
+
* imperative `config.setLocale(...)` calls from a settings picker that
|
|
30
|
+
* does not also push through `TranslateContext`. For the callable-
|
|
31
|
+
* translator pattern, keep using `useTranslate()` / `useTranslateExpo()`
|
|
32
|
+
* — both hooks remain available.
|
|
27
33
|
*
|
|
28
|
-
* @returns {
|
|
34
|
+
* @returns {string | undefined}
|
|
29
35
|
*/
|
|
30
36
|
export default function useLocaleExpo() {
|
|
31
37
|
const localeContext = useContext(TranslateContext);
|
|
@@ -78,5 +84,12 @@ export default function useLocaleExpo() {
|
|
|
78
84
|
lastWrittenFallbacksRef.current = deviceLocales;
|
|
79
85
|
config.setFallbacks(deviceLocales);
|
|
80
86
|
}, [deviceLocales]);
|
|
87
|
+
// Read the authoritative locale from `config` (rather than returning the
|
|
88
|
+
// derived `primaryLocale`) so an imperative `config.setLocale("de")` from a
|
|
89
|
+
// settings picker — which emits `onLocaleChange` and re-renders this hook
|
|
90
|
+
// via `setTick` above — surfaces in the return value too. Returning
|
|
91
|
+
// `primaryLocale` would miss those overrides whenever the host app does not
|
|
92
|
+
// also push the new locale through `TranslateContext`.
|
|
93
|
+
return config.getLocale();
|
|
81
94
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"use-locale-expo.js","sourceRoot":"","sources":["../../src/use-locale-expo.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport {useContext, useEffect, useMemo, useRef, useState} from \"react\"\nimport {useLocales} from \"expo-localization\"\nimport config from \"./config.js\"\nimport events from \"./events.js\"\nimport TranslateContext from \"./translate-context.js\"\n\n/**\n * Subscribes the calling component to the current locale so it re-renders\n * when any code calls `config.setLocale(...)` (e.g. a settings picker).\n * Also syncs the context-set locale + device locales into the global\n * `config` on first mount and whenever the context/device values change,\n * so direct callers of `translate(...)` read the right values without\n * needing the hook's return value.\n *\n * Pair with a class-field `_ = translate` (or a direct `import translate\n * from \"gettext-universal/build/src/translate.js\"`) so the translator is\n * always defined and typechecks cleanly, instead of relying on the\n * `useTranslate()` return value being assigned inside `setup()`.\n *\n * Does NOT fight explicit `config.setLocale(...)` callers — the hook\n * only writes when ITS OWN derived primary/fallback changes, tracked\n * via refs, so a settings picker that calls `setLocale` stays in effect\n * across re-renders.\n *\n * Returns the currently active locale string from `config.getLocale()`\n * (or `undefined` when no locale has been set yet) so callers can pass\n * it as a `useEffect` dependency. The hook's own `setTick` subscription\n * to `onLocaleChange` makes the return value reactive — including\n * imperative `config.setLocale(...)` calls from a settings picker that\n * does not also push through `TranslateContext`. For the callable-\n * translator pattern, keep using `useTranslate()` / `useTranslateExpo()`\n * — both hooks remain available.\n *\n * @returns {string | undefined}\n */\nexport default function useLocaleExpo() {\n  const localeContext = useContext(TranslateContext)\n  const locales = useLocales()\n  const contextLocale = localeContext?.locale\n\n  const deviceLocales = useMemo(() => {\n    if (!Array.isArray(locales)) return []\n\n    return locales\n      .map((localeData) => localeData.languageCode)\n      .filter(/** @type {(value: string | null) => value is string} */ ((value) => typeof value === \"string\" && value.length > 0))\n  }, [locales])\n\n  const primaryLocale = contextLocale || deviceLocales[0]\n\n  // Re-render whenever any code calls `config.setLocale(...)` — e.g. a\n  // settings picker that swaps the active locale from another screen.\n  //\n  // Must subscribe BEFORE the primary/fallbacks `useEffect`s below —\n  // those call `config.setLocale(...)` which emits `onLocaleChange`, and\n  // without a live listener the first-mount sync of a stale `config`\n  // would be silently missed, leaving the component rendering stale\n  // translations from `translate(...)` until an unrelated re-render.\n  const [, setTick] = useState(0)\n\n  useEffect(() => {\n    /** @returns {void} */\n    const onLocaleChange = () => {\n      setTick((tick) => tick + 1)\n    }\n\n    events.on(\"onLocaleChange\", onLocaleChange)\n\n    return () => {\n      events.off(\"onLocaleChange\", onLocaleChange)\n    }\n  }, [])\n\n  /** @type {React.MutableRefObject<string | null>} */\n  const lastWrittenPrimaryRef = useRef(null)\n\n  useEffect(() => {\n    if (!primaryLocale) return\n    if (lastWrittenPrimaryRef.current === primaryLocale) return\n\n    lastWrittenPrimaryRef.current = primaryLocale\n    config.setLocale(primaryLocale)\n  }, [primaryLocale])\n\n  /** @type {React.MutableRefObject<string[] | null>} */\n  const lastWrittenFallbacksRef = useRef(null)\n\n  useEffect(() => {\n    const previous = lastWrittenFallbacksRef.current\n\n    if (previous && previous.length === deviceLocales.length && previous.every((locale, index) => locale === deviceLocales[index])) {\n      return\n    }\n\n    lastWrittenFallbacksRef.current = deviceLocales\n    config.setFallbacks(deviceLocales)\n  }, [deviceLocales])\n\n  // Read the authoritative locale from `config` (rather than returning the\n  // derived `primaryLocale`) so an imperative `config.setLocale(\"de\")` from a\n  // settings picker — which emits `onLocaleChange` and re-renders this hook\n  // via `setTick` above — surfaces in the return value too. Returning\n  // `primaryLocale` would miss those overrides whenever the host app does not\n  // also push the new locale through `TranslateContext`.\n  return config.getLocale()\n}\n"]}
|