@alauda-fe/common 1.2.0 → 1.2.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.
|
@@ -15,11 +15,23 @@ export function getAvailableLanguages() {
|
|
|
15
15
|
}
|
|
16
16
|
return __availableLanguages;
|
|
17
17
|
}
|
|
18
|
-
export function getUserLanguage() {
|
|
18
|
+
export function getUserLanguage(availableLanguages) {
|
|
19
|
+
availableLanguages =
|
|
20
|
+
availableLanguages || getAvailableLanguages().map(lang => lang.id);
|
|
19
21
|
const localeLanguage = localStorage.getItem(LOCALE_STORAGE);
|
|
20
22
|
const userLanguages = (localeLanguage ? [localeLanguage] : []).concat(navigator.languages);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
23
|
+
for (const userLang of userLanguages) {
|
|
24
|
+
const resultLang = availableLanguages.find(availableLang => availableLang === userLang);
|
|
25
|
+
if (resultLang) {
|
|
26
|
+
return resultLang;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
for (const userLang of userLanguages) {
|
|
30
|
+
const resultLang = availableLanguages.find(availableLang => availableLang.split('-')[0] === userLang.split('-')[0]);
|
|
31
|
+
if (resultLang) {
|
|
32
|
+
return resultLang;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return FALLBACK_LANGUAGE;
|
|
24
36
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaTE4bi1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWJzL2NvbW1vbi9zcmMvdHJhbnNsYXRlL2kxOG4tY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFaEUsSUFBSSxvQkFBeUQsQ0FBQztBQUU5RCxNQUFNLENBQUMsS0FBSyxVQUFVLHNCQUFzQjtJQUcxQyxvQkFBb0I7UUFDbEIsQ0FBQyxNQUFNLEtBQUssQ0FDVixRQUFRLENBQUMsUUFBUSxLQUFLLFdBQVc7WUFDL0IsQ0FBQyxDQUFDLDhCQUE4QjtZQUNoQyxDQUFDLENBQUMsZ0NBQWdDLENBQ3JDO2FBQ0UsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDO2FBQ3ZCLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0lBRWhELE9BQU8sb0JBQW9CLENBQUM7QUFDOUIsQ0FBQztBQUVELE1BQU0sVUFBVSxxQkFBcUI7SUFHbkMsSUFBSSxDQUFDLG9CQUFvQixFQUFFO1FBQ3pCLE1BQU0sSUFBSSxLQUFLLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztLQUNuRDtJQUNELE9BQU8sb0JBQW9CLENBQUM7QUFDOUIsQ0FBQztBQUVELE1BQU0sVUFBVSxlQUFlLENBQUMsa0JBQTZCO0lBQzNELGtCQUFrQjtRQUNoQixrQkFBa0IsSUFBSSxxQkFBcUIsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUVyRSxNQUFNLGNBQWMsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sYUFBYSxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQ25FLFNBQVMsQ0FBQyxTQUFTLENBQ3BCLENBQUM7SUFFRixLQUFLLE1BQU0sUUFBUSxJQUFJLGFBQWEsRUFBRTtRQUNwQyxNQUFNLFVBQVUsR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQ3hDLGFBQWEsQ0FBQyxFQUFFLENBQUMsYUFBYSxLQUFLLFFBQVEsQ0FDNUMsQ0FBQztRQUNGLElBQUksVUFBVSxFQUFFO1lBQ2QsT0FBTyxVQUFVLENBQUM7U0FDbkI7S0FDRjtJQUVELEtBQUssTUFBTSxRQUFRLElBQUksYUFBYSxFQUFFO1FBQ3BDLE1BQU0sVUFBVSxHQUFHLGtCQUFrQixDQUFDLElBQUksQ0FDeEMsYUFBYSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQ3hFLENBQUM7UUFDRixJQUFJLFVBQVUsRUFBRTtZQUNkLE9BQU8sVUFBVSxDQUFDO1NBQ25CO0tBQ0Y7SUFFRCxPQUFPLGlCQUFpQixDQUFDO0FBQzNCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEZWVwUmVhZG9ubHkgfSBmcm9tICd0cy1lc3NlbnRpYWxzJztcblxuaW1wb3J0IHsgRkFMTEJBQ0tfTEFOR1VBR0UsIExPQ0FMRV9TVE9SQUdFIH0gZnJvbSAnLi9jb25zdGFudHMnO1xuXG5sZXQgX19hdmFpbGFibGVMYW5ndWFnZXM6IEFycmF5PHsgaWQ6IHN0cmluZzsgbmFtZTogc3RyaW5nIH0+O1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbG9hZEF2YWlsYWJsZUxhbmd1YWdlcygpOiBQcm9taXNlPFxuICBBcnJheTx7IGlkOiBzdHJpbmc7IG5hbWU6IHN0cmluZyB9PlxuPiB7XG4gIF9fYXZhaWxhYmxlTGFuZ3VhZ2VzID1cbiAgICAoYXdhaXQgZmV0Y2goXG4gICAgICBsb2NhdGlvbi5ob3N0bmFtZSA9PT0gJ2xvY2FsaG9zdCdcbiAgICAgICAgPyAnL2NvbnNvbGUtaTE4bi9sYW5ndWFnZXMuanNvbidcbiAgICAgICAgOiAnL2NvbnNvbGUvYXBpL3YxL2kxOG4vbGFuZ3VhZ2VzJyxcbiAgICApXG4gICAgICAudGhlbihyZXMgPT4gcmVzLmpzb24oKSlcbiAgICAgIC50aGVuKHJlcyA9PiByZXMuYXZhaWxhYmxlTGFuZ3VhZ2VzKSkgfHwgW107XG5cbiAgcmV0dXJuIF9fYXZhaWxhYmxlTGFuZ3VhZ2VzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0QXZhaWxhYmxlTGFuZ3VhZ2VzKCk6IERlZXBSZWFkb25seTxcbiAgdHlwZW9mIF9fYXZhaWxhYmxlTGFuZ3VhZ2VzXG4+IHtcbiAgaWYgKCFfX2F2YWlsYWJsZUxhbmd1YWdlcykge1xuICAgIHRocm93IG5ldyBFcnJvcignQXZhaWxhYmxlIGxhbmd1YWdlcyBub3QgbG9hZGVkJyk7XG4gIH1cbiAgcmV0dXJuIF9fYXZhaWxhYmxlTGFuZ3VhZ2VzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0VXNlckxhbmd1YWdlKGF2YWlsYWJsZUxhbmd1YWdlcz86IHN0cmluZ1tdKSB7XG4gIGF2YWlsYWJsZUxhbmd1YWdlcyA9XG4gICAgYXZhaWxhYmxlTGFuZ3VhZ2VzIHx8IGdldEF2YWlsYWJsZUxhbmd1YWdlcygpLm1hcChsYW5nID0+IGxhbmcuaWQpO1xuXG4gIGNvbnN0IGxvY2FsZUxhbmd1YWdlID0gbG9jYWxTdG9yYWdlLmdldEl0ZW0oTE9DQUxFX1NUT1JBR0UpO1xuICBjb25zdCB1c2VyTGFuZ3VhZ2VzID0gKGxvY2FsZUxhbmd1YWdlID8gW2xvY2FsZUxhbmd1YWdlXSA6IFtdKS5jb25jYXQoXG4gICAgbmF2aWdhdG9yLmxhbmd1YWdlcyxcbiAgKTtcblxuICBmb3IgKGNvbnN0IHVzZXJMYW5nIG9mIHVzZXJMYW5ndWFnZXMpIHtcbiAgICBjb25zdCByZXN1bHRMYW5nID0gYXZhaWxhYmxlTGFuZ3VhZ2VzLmZpbmQoXG4gICAgICBhdmFpbGFibGVMYW5nID0+IGF2YWlsYWJsZUxhbmcgPT09IHVzZXJMYW5nLFxuICAgICk7XG4gICAgaWYgKHJlc3VsdExhbmcpIHtcbiAgICAgIHJldHVybiByZXN1bHRMYW5nO1xuICAgIH1cbiAgfVxuXG4gIGZvciAoY29uc3QgdXNlckxhbmcgb2YgdXNlckxhbmd1YWdlcykge1xuICAgIGNvbnN0IHJlc3VsdExhbmcgPSBhdmFpbGFibGVMYW5ndWFnZXMuZmluZChcbiAgICAgIGF2YWlsYWJsZUxhbmcgPT4gYXZhaWxhYmxlTGFuZy5zcGxpdCgnLScpWzBdID09PSB1c2VyTGFuZy5zcGxpdCgnLScpWzBdLFxuICAgICk7XG4gICAgaWYgKHJlc3VsdExhbmcpIHtcbiAgICAgIHJldHVybiByZXN1bHRMYW5nO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBGQUxMQkFDS19MQU5HVUFHRTtcbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alauda-fe/common",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "Alauda frontend team common codes.",
|
|
5
5
|
"author": "Alauda Frontend",
|
|
6
6
|
"license": "MIT",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"ui"
|
|
13
13
|
],
|
|
14
14
|
"peerDependencies": {
|
|
15
|
-
"@alauda-fe/i18n": "1.0.
|
|
15
|
+
"@alauda-fe/i18n": "1.0.4",
|
|
16
16
|
"@alauda/chart": "^0.1.11",
|
|
17
17
|
"@alauda/code-editor": "^5.1.0",
|
|
18
18
|
"@alauda/ui": "^7.2.0",
|
|
@@ -8,5 +8,5 @@ export declare function loadAvailableLanguages(): Promise<Array<{
|
|
|
8
8
|
name: string;
|
|
9
9
|
}>>;
|
|
10
10
|
export declare function getAvailableLanguages(): DeepReadonly<typeof __availableLanguages>;
|
|
11
|
-
export declare function getUserLanguage(): string;
|
|
11
|
+
export declare function getUserLanguage(availableLanguages?: string[]): string;
|
|
12
12
|
export {};
|