Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/cloud/components/Editor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ const Editor = ({
const editorIndentType = settings['general.editorIndentType']
const editorIndentSize = settings['general.editorIndentSize']
const showEditorLineNumbers = settings['general.editorShowLineNumbers']
const enableSpellCheck = settings['general.enableSpellcheck']

return {
mode: 'markdown',
Expand All @@ -263,6 +264,7 @@ const Editor = ({
},
scrollPastEnd: true,
// fixes IME being on top of current line, Codemirror issue: https://github.com/codemirror/CodeMirror/issues/3137
spellcheck: enableSpellCheck,
inputStyle: 'contenteditable',
}
}, [settings])
Expand Down
37 changes: 37 additions & 0 deletions src/cloud/components/settings/UserPreferencesForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ const UserPreferencesForm = () => {
[setSettings]
)

const selectEnableSpellcheck = useCallback(
(formOption: FormSelectOption) => {
setSettings({
'general.enableSpellcheck': formOption.value === 'Enabled',
})
},
[setSettings]
)

const selectEditorTheme = useCallback(
(value: string) => {
setSettings({
Expand Down Expand Up @@ -223,6 +232,34 @@ const UserPreferencesForm = () => {
},
],
},
{
title: t(lngKeys.SettingsEnableEditorSpellcheck),
items: [
{
type: 'node',
element: (
<FormSelect
options={[
{
label: t(lngKeys.GeneralEnableVerb),
value: 'Enabled',
},
{ label: t(lngKeys.GeneralDisableVerb), value: 'Disabled' },
]}
value={{
label: settings['general.enableSpellcheck']
? t(lngKeys.GeneralEnableVerb)
: t(lngKeys.GeneralDisableVerb),
value: settings['general.enableSpellcheck']
? 'Enabled'
: 'Disabled',
}}
onChange={selectEnableSpellcheck}
/>
),
},
],
},
{
title: t(lngKeys.SettingsShowEditorLineNumbers),
items: [
Expand Down
1 change: 1 addition & 0 deletions src/cloud/lib/i18n/enUS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const enTranslation: TranslationSource = {
[lngKeys.SettingsIndentType]: 'Editor Indent Type',
[lngKeys.SettingsShowEditorToolbar]: 'Editor Toolbar',
[lngKeys.SettingsShowEditorLineNumbers]: 'Editor Line Numbers',
[lngKeys.SettingsEnableEditorSpellcheck]: 'Editor Spellcheck',
[lngKeys.SettingsIndentSize]: 'Editor Indent Size',
[lngKeys.SettingsUserForum]: 'User Forum (New!)',
[lngKeys.ManagePreferences]: 'Manage your preferences.',
Expand Down
2 changes: 2 additions & 0 deletions src/cloud/lib/i18n/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ const frTranslation: TranslationSource = {
[lngKeys.SettingsIndentType]: "Type d'indentation pour l'éditeur",
[lngKeys.SettingsShowEditorToolbar]: "Barre d'outils de l'éditeur",
[lngKeys.SettingsShowEditorLineNumbers]: "Numéros de ligne de l'éditeur",
[lngKeys.SettingsEnableEditorSpellcheck]:
'Éditeur de vérification orthographique',
[lngKeys.SettingsIndentSize]: "Taille de l'indentation pour l'éditeur",
[lngKeys.SettingsUserForum]: "Forum d'utilisateurs (nouveau!)",
[lngKeys.ManagePreferences]: 'Gérez vos préférences.',
Expand Down
1 change: 1 addition & 0 deletions src/cloud/lib/i18n/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const jpTranslation: TranslationSource = {
[lngKeys.SettingsIndentType]: 'エディタインデントの種類',
[lngKeys.SettingsShowEditorToolbar]: 'エディターツールバー',
[lngKeys.SettingsShowEditorLineNumbers]: 'エディタの行番号',
[lngKeys.SettingsEnableEditorSpellcheck]: 'スペルチェックエディタ',
[lngKeys.SettingsIndentSize]: 'エディタインデントのサイズ',
[lngKeys.SettingsUserForum]: 'ユーザーフォーラム(New!!)',
[lngKeys.ManagePreferences]: 'あなた好みにカスタマイズしましょう。',
Expand Down
1 change: 1 addition & 0 deletions src/cloud/lib/i18n/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export enum lngKeys {
SettingsIndentType = 'settings.indentType',
SettingsShowEditorToolbar = 'settings.showEditorToolbar',
SettingsShowEditorLineNumbers = 'settings.showEditorLineNumbers',
SettingsEnableEditorSpellcheck = 'settings.enableSpellcheck',
SettingsIndentSize = 'settings.indentSize',
SettingsSpace = 'settings.space',
SettingsSpaceDelete = 'settings.space.delete',
Expand Down
1 change: 1 addition & 0 deletions src/cloud/lib/i18n/zhCN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const zhTranslation: TranslationSource = {
[lngKeys.SettingsIndentType]: '编辑器缩进类型',
[lngKeys.SettingsShowEditorToolbar]: '编辑器工具栏',
[lngKeys.SettingsShowEditorLineNumbers]: '编辑器行号',
[lngKeys.SettingsEnableEditorSpellcheck]: '拼写检查编辑器',
[lngKeys.SettingsIndentSize]: '编辑器缩进大小',
[lngKeys.SettingsUserForum]: '用户论坛(新!)',
[lngKeys.ManagePreferences]: '管理您的首选项。',
Expand Down
1 change: 1 addition & 0 deletions src/cloud/lib/stores/settings/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const baseUserSettings: UserSettings = {
'SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace',
'general.editorShowLineNumbers': true,
'general.showEditorToolbar': true,
'general.enableSpellcheck': true,
}

export type SettingsTab =
Expand Down
1 change: 1 addition & 0 deletions src/cloud/lib/stores/settings/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface UserSettings {
'general.editorFontFamily': string
'general.editorShowLineNumbers': boolean
'general.showEditorToolbar': boolean
'general.enableSpellcheck': boolean
}

export const codeMirrorEditorThemes = [
Expand Down