fix typos

This commit is contained in:
刘浩远 2020-07-10 12:56:58 +08:00
parent 4f2beea63d
commit e53d30ede7
8 changed files with 25 additions and 25 deletions

View File

@ -68,11 +68,11 @@ const settingsBridge = {
ipcRenderer.invoke("set-font-size", size) ipcRenderer.invoke("set-font-size", size)
}, },
getFetchInteval: (): number => { getFetchInterval: (): number => {
return ipcRenderer.sendSync("get-fetch-inteval") return ipcRenderer.sendSync("get-fetch-interval")
}, },
setFetchInteval: (inteval: number) => { setFetchInterval: (interval: number) => {
ipcRenderer.invoke("set-fetch-inteval", inteval) ipcRenderer.invoke("set-fetch-interval", interval)
}, },
getAll: () => { getAll: () => {

View File

@ -8,7 +8,7 @@ import DangerButton from "../utils/danger-button"
type AppTabProps = { type AppTabProps = {
setLanguage: (option: string) => void setLanguage: (option: string) => void
setFetchInteval: (inteval: number) => void setFetchInterval: (interval: number) => void
deleteArticles: (days: number) => Promise<void> deleteArticles: (days: number) => Promise<void>
importAll: () => Promise<void> importAll: () => Promise<void>
} }
@ -60,7 +60,7 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
{ key: ThemeSettings.Dark, text: intl.get("app.darkTheme") } { key: ThemeSettings.Dark, text: intl.get("app.darkTheme") }
] ]
fetchIntevalOptions = (): IDropdownOption[] => [ fetchIntervalOptions = (): IDropdownOption[] => [
{ key: 0, text: intl.get("app.never") }, { key: 0, text: intl.get("app.never") },
{ key: 10, text: intl.get("time.minute", { m: 10 }) }, { key: 10, text: intl.get("time.minute", { m: 10 }) },
{ key: 15, text: intl.get("time.minute", { m: 15 }) }, { key: 15, text: intl.get("time.minute", { m: 15 }) },
@ -69,8 +69,8 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
{ key: 45, text: intl.get("time.minute", { m: 45 }) }, { key: 45, text: intl.get("time.minute", { m: 45 }) },
{ key: 60, text: intl.get("time.hour", { h: 1 }) }, { key: 60, text: intl.get("time.hour", { h: 1 }) },
] ]
onFetchIntevalChanged = (item: IDropdownOption) => { onFetchIntervalChanged = (item: IDropdownOption) => {
this.props.setFetchInteval(item.key as number) this.props.setFetchInterval(item.key as number)
} }
deleteOptions = (): IDropdownOption[] => [ deleteOptions = (): IDropdownOption[] => [
@ -142,13 +142,13 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
onChange={this.onThemeChange} onChange={this.onThemeChange}
selectedKey={this.state.themeSettings} /> selectedKey={this.state.themeSettings} />
<Label>{intl.get("app.fetchInteval")}</Label> <Label>{intl.get("app.fetchInterval")}</Label>
<Stack horizontal> <Stack horizontal>
<Stack.Item> <Stack.Item>
<Dropdown <Dropdown
defaultSelectedKey={window.settings.getFetchInteval()} defaultSelectedKey={window.settings.getFetchInterval()}
options={this.fetchIntevalOptions()} options={this.fetchIntervalOptions()}
onChanged={this.onFetchIntevalChanged} onChanged={this.onFetchIntervalChanged}
style={{width: 200}} /> style={{width: 200}} />
</Stack.Item> </Stack.Item>
</Stack> </Stack>

View File

@ -10,8 +10,8 @@ const mapDispatchToProps = dispatch => ({
window.settings.setLocaleSettings(option) window.settings.setLocaleSettings(option)
dispatch(initIntl()) dispatch(initIntl())
}, },
setFetchInteval: (inteval: number) => { setFetchInterval: (interval: number) => {
window.settings.setFetchInteval(inteval) window.settings.setFetchInterval(interval)
dispatch(setupAutoFetch()) dispatch(setupAutoFetch())
}, },
deleteArticles: (days: number) => new Promise((resolve) => { deleteArticles: (days: number) => new Promise((resolve) => {

View File

@ -121,10 +121,10 @@ ipcMain.on("get-all-settings", (event) => {
event.returnValue = output event.returnValue = output
}) })
const FETCH_INTEVAL_STORE_KEY = "fetchInteval" const FETCH_INTEVAL_STORE_KEY = "fetchInterval"
ipcMain.on("get-fetch-inteval", (event) => { ipcMain.on("get-fetch-interval", (event) => {
event.returnValue = store.get(FETCH_INTEVAL_STORE_KEY, 0) event.returnValue = store.get(FETCH_INTEVAL_STORE_KEY, 0)
}) })
ipcMain.handle("set-fetch-inteval", (_, inteval: number) => { ipcMain.handle("set-fetch-interval", (_, interval: number) => {
store.set(FETCH_INTEVAL_STORE_KEY, inteval) store.set(FETCH_INTEVAL_STORE_KEY, interval)
}) })

View File

@ -38,5 +38,5 @@ export type SchemaTypes = {
sourceGroups: SourceGroup[] sourceGroups: SourceGroup[]
fontSize: number fontSize: number
menuOn: boolean menuOn: boolean
fetchInteval: number fetchInterval: number
} }

View File

@ -183,7 +183,7 @@
"pac": "PAC Address", "pac": "PAC Address",
"setPac": "Set PAC", "setPac": "Set PAC",
"pacHint": "For Socks proxies, it is recommended for PAC to return \"SOCKS5\" for proxy-side DNS. Turning off proxy requires restart.", "pacHint": "For Socks proxies, it is recommended for PAC to return \"SOCKS5\" for proxy-side DNS. Turning off proxy requires restart.",
"fetchInteval": "Automatic fetch inteval", "fetchInterval": "Automatic fetch interval",
"never": "Never" "never": "Never"
} }
} }

View File

@ -183,7 +183,7 @@
"pac": "PAC地址", "pac": "PAC地址",
"setPac": "设置PAC", "setPac": "设置PAC",
"pacHint": "对于Socks代理建议PAC返回“SOCKS5”以启用代理端解析。关闭代理需重启应用后生效。", "pacHint": "对于Socks代理建议PAC返回“SOCKS5”以启用代理端解析。关闭代理需重启应用后生效。",
"fetchInteval": "自动抓取频率", "fetchInterval": "自动抓取频率",
"never": "从不" "never": "从不"
} }
} }

View File

@ -194,9 +194,9 @@ let fetchTimeout: NodeJS.Timeout
export function setupAutoFetch(): AppThunk { export function setupAutoFetch(): AppThunk {
return (dispatch, getState) => { return (dispatch, getState) => {
clearTimeout(fetchTimeout) clearTimeout(fetchTimeout)
const setupTimeout = (inteval?: number) => { const setupTimeout = (interval?: number) => {
if (!inteval) inteval = window.settings.getFetchInteval() if (!interval) interval = window.settings.getFetchInterval()
if (inteval) { if (interval) {
fetchTimeout = setTimeout(() => { fetchTimeout = setTimeout(() => {
let state = getState() let state = getState()
if (!state.app.settings.display) { if (!state.app.settings.display) {
@ -204,7 +204,7 @@ export function setupAutoFetch(): AppThunk {
} else { } else {
setupTimeout(1) setupTimeout(1)
} }
}, inteval * 60000) }, interval * 60000)
} }
} }
setupTimeout() setupTimeout()