@unchainedshop/utils 4.0.0-rc.3 → 4.0.0-rc.4
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/lib/locale-helpers.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const systemLocale: Intl.Locale;
|
|
2
|
-
export declare const resolveBestSupported: (acceptLanguage: string, supportedLocales: string[]
|
|
2
|
+
export declare const resolveBestSupported: (acceptLanguage: string, supportedLocales: string[]) => Intl.Locale;
|
|
3
3
|
export declare const resolveBestCountry: (localeCountry: string, shopCountry: string, countries: {
|
|
4
4
|
isoCode: string;
|
|
5
5
|
}[]) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locale-helpers.d.ts","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,aAA4D,CAAC;AAEtF,eAAO,MAAM,oBAAoB,GAC/B,gBAAgB,MAAM,EACtB,kBAAkB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"locale-helpers.d.ts","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,aAA4D,CAAC;AAEtF,eAAO,MAAM,oBAAoB,GAC/B,gBAAgB,MAAM,EACtB,kBAAkB,MAAM,EAAE,KACzB,IAAI,CAAC,MAcP,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,eAAe,MAAM,EACrB,aAAa,MAAM,EACnB,WAAW;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,WAcjC,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,gBAAgB,MAAM,EAAE,YAAY;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,WAc5F,CAAC"}
|
package/lib/locale-helpers.js
CHANGED
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import { resolveAcceptLanguage } from 'resolve-accept-language';
|
|
2
2
|
const { UNCHAINED_LANG = 'de', UNCHAINED_COUNTRY = 'CH', UNCHAINED_CURRENCY = 'CHF' } = process.env;
|
|
3
3
|
export const systemLocale = new Intl.Locale(`${UNCHAINED_LANG}-${UNCHAINED_COUNTRY}`);
|
|
4
|
-
export const resolveBestSupported = (acceptLanguage, supportedLocales
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
export const resolveBestSupported = (acceptLanguage, supportedLocales) => {
|
|
5
|
+
try {
|
|
6
|
+
const { match } = resolveAcceptLanguage(acceptLanguage || '', supportedLocales, systemLocale.baseName, {
|
|
7
|
+
returnMatchType: true,
|
|
8
|
+
});
|
|
9
|
+
return new Intl.Locale(match);
|
|
10
|
+
}
|
|
11
|
+
catch {
|
|
12
|
+
return systemLocale;
|
|
13
|
+
}
|
|
9
14
|
};
|
|
10
15
|
export const resolveBestCountry = (localeCountry, shopCountry, countries) => {
|
|
11
16
|
if (shopCountry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locale-helpers.js","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,EAAE,cAAc,GAAG,IAAI,EAAE,iBAAiB,GAAG,IAAI,EAAE,kBAAkB,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEpG,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,cAAc,IAAI,iBAAiB,EAAE,CAAC,CAAC;AAEtF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,cAAsB,EACtB,gBAA0B,
|
|
1
|
+
{"version":3,"file":"locale-helpers.js","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,EAAE,cAAc,GAAG,IAAI,EAAE,iBAAiB,GAAG,IAAI,EAAE,kBAAkB,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEpG,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,cAAc,IAAI,iBAAiB,EAAE,CAAC,CAAC;AAEtF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,cAAsB,EACtB,gBAA0B,EACb,EAAE;IACf,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,qBAAqB,CACrC,cAAc,IAAI,EAAE,EACpB,gBAAgB,EAChB,YAAY,CAAC,QAAQ,EACrB;YACE,eAAe,EAAE,IAAI;SACtB,CACF,CAAC;QACF,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,aAAqB,EACrB,WAAmB,EACnB,SAAgC,EAChC,EAAE;IACF,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAS,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE;YACzE,IAAI,WAAW,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpC,OAAO,OAAO,CAAC,OAAO,CAAC;YACzB,CAAC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,eAAe,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,aAAa,IAAI,YAAY,CAAC,MAAM,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,cAAsB,EAAE,UAAiC,EAAE,EAAE;IAC/F,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,cAAc,CAAC,CAAC;QAC5F,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC,OAAO,CAAC;QAClC,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,kBAAkB,CAAC,CAAC;IAChG,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC,OAAO,CAAC;IAClC,CAAC;IAED,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,kBAAkB,CAAC;AACxD,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/utils",
|
|
3
|
-
"version": "4.0.0-rc.
|
|
3
|
+
"version": "4.0.0-rc.4",
|
|
4
4
|
"main": "lib/utils-index.js",
|
|
5
5
|
"types": "lib/utils-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@unchainedshop/logger": "^4.0.0-rc.
|
|
30
|
+
"@unchainedshop/logger": "^4.0.0-rc.4",
|
|
31
31
|
"hashids": "^2.3.0",
|
|
32
32
|
"resolve-accept-language": "^3.1.11"
|
|
33
33
|
},
|
package/src/locale-helpers.ts
CHANGED
|
@@ -7,12 +7,20 @@ export const systemLocale = new Intl.Locale(`${UNCHAINED_LANG}-${UNCHAINED_COUNT
|
|
|
7
7
|
export const resolveBestSupported = (
|
|
8
8
|
acceptLanguage: string,
|
|
9
9
|
supportedLocales: string[],
|
|
10
|
-
fallbackLocale: string,
|
|
11
10
|
): Intl.Locale => {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
try {
|
|
12
|
+
const { match } = resolveAcceptLanguage(
|
|
13
|
+
acceptLanguage || '',
|
|
14
|
+
supportedLocales,
|
|
15
|
+
systemLocale.baseName,
|
|
16
|
+
{
|
|
17
|
+
returnMatchType: true,
|
|
18
|
+
},
|
|
19
|
+
);
|
|
20
|
+
return new Intl.Locale(match);
|
|
21
|
+
} catch {
|
|
22
|
+
return systemLocale;
|
|
23
|
+
}
|
|
16
24
|
};
|
|
17
25
|
|
|
18
26
|
export const resolveBestCountry = (
|