From e53d30ede75de40e06fcb198a277d257277eeacf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=A9=E8=BF=9C?= Date: Fri, 10 Jul 2020 12:56:58 +0800 Subject: [PATCH] fix typos --- src/bridges/settings.ts | 8 ++++---- src/components/settings/app.tsx | 16 ++++++++-------- src/containers/settings/app-container.tsx | 4 ++-- src/main/settings.ts | 8 ++++---- src/schema-types.ts | 2 +- src/scripts/i18n/en-US.json | 2 +- src/scripts/i18n/zh-CN.json | 2 +- src/scripts/models/app.ts | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/bridges/settings.ts b/src/bridges/settings.ts index ab0103d..ee7693a 100644 --- a/src/bridges/settings.ts +++ b/src/bridges/settings.ts @@ -68,11 +68,11 @@ const settingsBridge = { ipcRenderer.invoke("set-font-size", size) }, - getFetchInteval: (): number => { - return ipcRenderer.sendSync("get-fetch-inteval") + getFetchInterval: (): number => { + return ipcRenderer.sendSync("get-fetch-interval") }, - setFetchInteval: (inteval: number) => { - ipcRenderer.invoke("set-fetch-inteval", inteval) + setFetchInterval: (interval: number) => { + ipcRenderer.invoke("set-fetch-interval", interval) }, getAll: () => { diff --git a/src/components/settings/app.tsx b/src/components/settings/app.tsx index d21d910..4ac113a 100644 --- a/src/components/settings/app.tsx +++ b/src/components/settings/app.tsx @@ -8,7 +8,7 @@ import DangerButton from "../utils/danger-button" type AppTabProps = { setLanguage: (option: string) => void - setFetchInteval: (inteval: number) => void + setFetchInterval: (interval: number) => void deleteArticles: (days: number) => Promise importAll: () => Promise } @@ -60,7 +60,7 @@ class AppTab extends React.Component { { key: ThemeSettings.Dark, text: intl.get("app.darkTheme") } ] - fetchIntevalOptions = (): IDropdownOption[] => [ + fetchIntervalOptions = (): IDropdownOption[] => [ { key: 0, text: intl.get("app.never") }, { key: 10, text: intl.get("time.minute", { m: 10 }) }, { key: 15, text: intl.get("time.minute", { m: 15 }) }, @@ -69,8 +69,8 @@ class AppTab extends React.Component { { key: 45, text: intl.get("time.minute", { m: 45 }) }, { key: 60, text: intl.get("time.hour", { h: 1 }) }, ] - onFetchIntevalChanged = (item: IDropdownOption) => { - this.props.setFetchInteval(item.key as number) + onFetchIntervalChanged = (item: IDropdownOption) => { + this.props.setFetchInterval(item.key as number) } deleteOptions = (): IDropdownOption[] => [ @@ -142,13 +142,13 @@ class AppTab extends React.Component { onChange={this.onThemeChange} selectedKey={this.state.themeSettings} /> - + diff --git a/src/containers/settings/app-container.tsx b/src/containers/settings/app-container.tsx index 6765697..ff4ee3c 100644 --- a/src/containers/settings/app-container.tsx +++ b/src/containers/settings/app-container.tsx @@ -10,8 +10,8 @@ const mapDispatchToProps = dispatch => ({ window.settings.setLocaleSettings(option) dispatch(initIntl()) }, - setFetchInteval: (inteval: number) => { - window.settings.setFetchInteval(inteval) + setFetchInterval: (interval: number) => { + window.settings.setFetchInterval(interval) dispatch(setupAutoFetch()) }, deleteArticles: (days: number) => new Promise((resolve) => { diff --git a/src/main/settings.ts b/src/main/settings.ts index 58fd9fb..72a013b 100644 --- a/src/main/settings.ts +++ b/src/main/settings.ts @@ -121,10 +121,10 @@ ipcMain.on("get-all-settings", (event) => { event.returnValue = output }) -const FETCH_INTEVAL_STORE_KEY = "fetchInteval" -ipcMain.on("get-fetch-inteval", (event) => { +const FETCH_INTEVAL_STORE_KEY = "fetchInterval" +ipcMain.on("get-fetch-interval", (event) => { event.returnValue = store.get(FETCH_INTEVAL_STORE_KEY, 0) }) -ipcMain.handle("set-fetch-inteval", (_, inteval: number) => { - store.set(FETCH_INTEVAL_STORE_KEY, inteval) +ipcMain.handle("set-fetch-interval", (_, interval: number) => { + store.set(FETCH_INTEVAL_STORE_KEY, interval) }) diff --git a/src/schema-types.ts b/src/schema-types.ts index ce50902..4298cea 100644 --- a/src/schema-types.ts +++ b/src/schema-types.ts @@ -38,5 +38,5 @@ export type SchemaTypes = { sourceGroups: SourceGroup[] fontSize: number menuOn: boolean - fetchInteval: number + fetchInterval: number } diff --git a/src/scripts/i18n/en-US.json b/src/scripts/i18n/en-US.json index fc3d340..e805bd8 100644 --- a/src/scripts/i18n/en-US.json +++ b/src/scripts/i18n/en-US.json @@ -183,7 +183,7 @@ "pac": "PAC Address", "setPac": "Set PAC", "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" } } \ No newline at end of file diff --git a/src/scripts/i18n/zh-CN.json b/src/scripts/i18n/zh-CN.json index 79ae742..d6c43d2 100644 --- a/src/scripts/i18n/zh-CN.json +++ b/src/scripts/i18n/zh-CN.json @@ -183,7 +183,7 @@ "pac": "PAC地址", "setPac": "设置PAC", "pacHint": "对于Socks代理建议PAC返回“SOCKS5”以启用代理端解析。关闭代理需重启应用后生效。", - "fetchInteval": "自动抓取频率", + "fetchInterval": "自动抓取频率", "never": "从不" } } \ No newline at end of file diff --git a/src/scripts/models/app.ts b/src/scripts/models/app.ts index 353568e..70bd0ca 100644 --- a/src/scripts/models/app.ts +++ b/src/scripts/models/app.ts @@ -194,9 +194,9 @@ let fetchTimeout: NodeJS.Timeout export function setupAutoFetch(): AppThunk { return (dispatch, getState) => { clearTimeout(fetchTimeout) - const setupTimeout = (inteval?: number) => { - if (!inteval) inteval = window.settings.getFetchInteval() - if (inteval) { + const setupTimeout = (interval?: number) => { + if (!interval) interval = window.settings.getFetchInterval() + if (interval) { fetchTimeout = setTimeout(() => { let state = getState() if (!state.app.settings.display) { @@ -204,7 +204,7 @@ export function setupAutoFetch(): AppThunk { } else { setupTimeout(1) } - }, inteval * 60000) + }, interval * 60000) } } setupTimeout()