Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-17 01:56:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #451 from toeverything/develop

Browse Source 
fix(i18n): default language select (#450)
This commit is contained in:
zuomeng wang
2022-09-22 09:59:33 +08:00
committed by GitHub
parent b3b933f708 47bbf187a5
commit d3f2b25fa0
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/venus/src/app/common/Header.tsx
+1 -1
View File
@@ -140,7 +140,7 @@ export const AFFiNEHeader = () => {
}} }}
/> />
<Select <Select
defaultValue={i18n.language} defaultValue={i18n.resolvedLanguage}
sx={{ display: matchesIPAD ? 'none' : 'intial' }} sx={{ display: matchesIPAD ? 'none' : 'intial' }}
onChange={changeLanguage} onChange={changeLanguage}
size="md" size="md"
apps/venus/src/app/common/MobileHeader.tsx
+16 -12
View File
@@ -17,6 +17,7 @@ import {
} from '@mui/material'; } from '@mui/material';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { LOCALES } from '../i18n';
import AFFiNETextLogo from './affine-text-logo.png'; import AFFiNETextLogo from './affine-text-logo.png';
export const MobileHeader = () => { export const MobileHeader = () => {
@@ -163,18 +164,21 @@ export const MobileHeader = () => {
timeout="auto" timeout="auto"
unmountOnExit unmountOnExit
> >
<ListItemButton {LOCALES.map(lang => (
onClick={() => i18n.changeLanguage('en')} <ListItemButton
> key={lang.tag}
<ListItemText primary="English" /> onClick={() =>
<Checkbox checked={i18n.language === 'en'} /> i18n.changeLanguage(lang.tag)
</ListItemButton> }
<ListItemButton >
onClick={() => i18n.changeLanguage('zh')} <ListItemText primary={lang.originalName} />
> <Checkbox
<ListItemText primary="简体中文" /> checked={
<Checkbox checked={i18n.language === 'zh'} /> i18n.resolvedLanguage === lang.tag
</ListItemButton> }
/>
</ListItemButton>
))}
</Collapse> </Collapse>
</List> </List>
</StyledDrawerContainer> </StyledDrawerContainer>
libs/components/layout/src/settings-sidebar/Settings/SettingsList.tsx
+1 -1
View File
@@ -48,7 +48,7 @@ export const SettingsList = () => {
{item.key === 'Language' ? ( {item.key === 'Language' ? (
<div style={{ marginLeft: '12em' }}> <div style={{ marginLeft: '12em' }}>
<Select <Select
defaultValue={i18n.language} defaultValue={i18n.resolvedLanguage}
onChange={changeLanguage} onChange={changeLanguage}
> >
{LOCALES.map(option => ( {LOCALES.map(option => (