Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: set default language #2722

Merged
merged 1 commit into from
Jun 6, 2023
Merged

fix: set default language #2722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/core-browser/__tests__/external-preference.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ describe('external preference tests', () => {
getExternalPreferenceProvider('general.language')?.set(unique_languageId, PreferenceScope.Default);
expect(getPreferenceLanguageId()).toBe(unique_languageId);

// 传入默认配置的情况下，如果可以通过 `getExternalPreference` 获取配置值，优先采用获取到的配置值
// 传入默认配置的情况下，如果可以通过 `getExternalPreference` 获取配置值，优先级为： Folder > Workspace > User > 传入值 > Default,
expect(
getPreferenceLanguageId({
'general.language': LOCALE_TYPES.EN_US,
} as IPreferences),
).toBe(unique_languageId);
).toBe(LOCALE_TYPES.EN_US);

// 采用 getExternalPreference 中的值兜底
expect(
Expand Down
11 changes: 8 additions & 3 deletions packages/core-browser/src/preferences/early-preferences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,14 @@ export function getPreferenceIconThemeId(): string {
export function getPreferenceLanguageId(defaultPreferences?: IPreferences): string {
// 默认从配置项中获取语言选项，其次从默认配置项中获取 `general.language`, 默认为 `en-US`
const langFromDefaultPreferences = defaultPreferences && defaultPreferences[GeneralSettingsId.Language];
return (
getExternalPreference<string>(GeneralSettingsId.Language).value || langFromDefaultPreferences || getLanguageId()
);
const langExternalPreference = getExternalPreference<string>(GeneralSettingsId.Language);

// 用户自定义语言设置优先于默认设置
if (langExternalPreference.value && langExternalPreference.scope > PreferenceScope.Default) {
return langExternalPreference.value;
}

return langFromDefaultPreferences || langExternalPreference.value || getLanguageId();
}

// 默认使用 localStorage
Expand Down