From e74de6105a0ca58c20c883d1ced6138a08e50559 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 8 Mar 2025 01:59:29 +0200 Subject: [PATCH] client/options: minor tweaks --- .../advanced/database_anonymization.ts | 24 +++++++++++++++---- .../advanced/database_integrity_check.ts | 2 +- .../options/advanced/vacuum_database.ts | 2 +- .../options/appearance/code_block.ts | 2 +- .../appearance/electron_integration.ts | 2 +- .../type_widgets/options/appearance/fonts.ts | 4 ++-- .../options/appearance/max_content_width.ts | 2 +- .../widgets/type_widgets/options/backup.ts | 2 +- .../code_notes/code_auto_read_only_size.ts | 2 +- .../app/widgets/type_widgets/options/etapi.ts | 2 +- .../type_widgets/options/i18n/language.ts | 2 +- .../type_widgets/options/images/images.ts | 2 +- .../other/attachment_erasure_timeout.ts | 4 ++-- .../options/other/html_import_tags.ts | 2 +- .../options/other/note_erasure_timeout.ts | 4 ++-- .../options/other/revision_snapshots_limit.ts | 2 +- .../other/revisions_snapshot_interval.ts | 2 +- .../options/other/search_engine.ts | 2 +- .../password/protected_session_timeout.ts | 4 +++- .../widgets/type_widgets/options/shortcuts.ts | 2 +- .../type_widgets/options/spellcheck.ts | 6 ++--- .../app/widgets/type_widgets/options/sync.ts | 4 ++-- .../options/text_notes/highlights_list.ts | 4 ++-- .../options/text_notes/table_of_contents.ts | 4 ++-- .../text_notes/text_auto_read_only_size.ts | 2 +- 25 files changed, 53 insertions(+), 37 deletions(-) diff --git a/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.ts b/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.ts index 1fdd48e1a..9ead621b7 100644 --- a/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.ts +++ b/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.ts @@ -6,22 +6,36 @@ import type { OptionMap } from "../../../../../../services/options_interface.js" const TPL = `
+ +

${t("database_anonymization.title")}

-

${t("database_anonymization.choose_anonymization")}

+

${t("database_anonymization.choose_anonymization")}

-
+
${t("database_anonymization.full_anonymization")}
-

${t("database_anonymization.full_anonymization_description")}

+

${t("database_anonymization.full_anonymization_description")}

-
+
${t("database_anonymization.light_anonymization")}
-

${t("database_anonymization.light_anonymization_description")}

+

${t("database_anonymization.light_anonymization_description")}

diff --git a/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.ts b/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.ts index 868145423..60c0f880e 100644 --- a/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.ts +++ b/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.ts @@ -7,7 +7,7 @@ const TPL = `

${t("database_integrity_check.title")}

-

${t("database_integrity_check.description")}

+

${t("database_integrity_check.description")}

diff --git a/src/public/app/widgets/type_widgets/options/advanced/vacuum_database.ts b/src/public/app/widgets/type_widgets/options/advanced/vacuum_database.ts index 811b7c90b..fb45c31b6 100644 --- a/src/public/app/widgets/type_widgets/options/advanced/vacuum_database.ts +++ b/src/public/app/widgets/type_widgets/options/advanced/vacuum_database.ts @@ -7,7 +7,7 @@ const TPL = `

${t("vacuum_database.title")}

-

${t("vacuum_database.description")}

+

${t("vacuum_database.description")}

`; diff --git a/src/public/app/widgets/type_widgets/options/appearance/code_block.ts b/src/public/app/widgets/type_widgets/options/appearance/code_block.ts index 4dcebb20e..deec1f744 100644 --- a/src/public/app/widgets/type_widgets/options/appearance/code_block.ts +++ b/src/public/app/widgets/type_widgets/options/appearance/code_block.ts @@ -25,7 +25,7 @@ const TPL = `

${t("highlighting.title")}

-

${t("highlighting.description")}

+

${t("highlighting.description")}

diff --git a/src/public/app/widgets/type_widgets/options/appearance/electron_integration.ts b/src/public/app/widgets/type_widgets/options/appearance/electron_integration.ts index 208c991cf..ea0552cfe 100644 --- a/src/public/app/widgets/type_widgets/options/appearance/electron_integration.ts +++ b/src/public/app/widgets/type_widgets/options/appearance/electron_integration.ts @@ -11,7 +11,7 @@ const TPL = `
-

${t("zoom_factor.description")}

+

${t("zoom_factor.description")}


diff --git a/src/public/app/widgets/type_widgets/options/appearance/fonts.ts b/src/public/app/widgets/type_widgets/options/appearance/fonts.ts index 900c91cba..51efa2b7a 100644 --- a/src/public/app/widgets/type_widgets/options/appearance/fonts.ts +++ b/src/public/app/widgets/type_widgets/options/appearance/fonts.ts @@ -126,9 +126,9 @@ const TPL = `
-

${t("fonts.note_tree_and_detail_font_sizing")}

+

${t("fonts.note_tree_and_detail_font_sizing")}

-

${t("fonts.not_all_fonts_available")}

+

${t("fonts.not_all_fonts_available")}

${t("fonts.apply_font_changes")} diff --git a/src/public/app/widgets/type_widgets/options/appearance/max_content_width.ts b/src/public/app/widgets/type_widgets/options/appearance/max_content_width.ts index 541d26eca..a5b47c8ea 100644 --- a/src/public/app/widgets/type_widgets/options/appearance/max_content_width.ts +++ b/src/public/app/widgets/type_widgets/options/appearance/max_content_width.ts @@ -9,7 +9,7 @@ const TPL = `

${t("max_content_width.title")}

-

${t("max_content_width.default_description")}

+

${t("max_content_width.default_description")}

diff --git a/src/public/app/widgets/type_widgets/options/backup.ts b/src/public/app/widgets/type_widgets/options/backup.ts index f51690dc8..ae0978335 100644 --- a/src/public/app/widgets/type_widgets/options/backup.ts +++ b/src/public/app/widgets/type_widgets/options/backup.ts @@ -32,7 +32,7 @@ const TPL = ` -

${t("backup.backup_recommendation")}

+

${t("backup.backup_recommendation")}

diff --git a/src/public/app/widgets/type_widgets/options/code_notes/code_auto_read_only_size.ts b/src/public/app/widgets/type_widgets/options/code_notes/code_auto_read_only_size.ts index dc414b396..584fd23f0 100644 --- a/src/public/app/widgets/type_widgets/options/code_notes/code_auto_read_only_size.ts +++ b/src/public/app/widgets/type_widgets/options/code_notes/code_auto_read_only_size.ts @@ -6,7 +6,7 @@ const TPL = `

${t("code_auto_read_only_size.title")}

-

${t("code_auto_read_only_size.description")}

+

${t("code_auto_read_only_size.description")}

diff --git a/src/public/app/widgets/type_widgets/options/etapi.ts b/src/public/app/widgets/type_widgets/options/etapi.ts index 36a37cc27..becf630eb 100644 --- a/src/public/app/widgets/type_widgets/options/etapi.ts +++ b/src/public/app/widgets/type_widgets/options/etapi.ts @@ -9,7 +9,7 @@ const TPL = `

${t("etapi.title")}

-

${t("etapi.description")}
+

${t("etapi.description")}
${t("etapi.see_more", { link_to_wiki: `${t("etapi.wiki")}`, // TODO: We use window.open src/public/app/services/link.ts -> prevents regular click behavior on "a" element here because it's a relative path diff --git a/src/public/app/widgets/type_widgets/options/i18n/language.ts b/src/public/app/widgets/type_widgets/options/i18n/language.ts index 1b8d34132..6f5124da6 100644 --- a/src/public/app/widgets/type_widgets/options/i18n/language.ts +++ b/src/public/app/widgets/type_widgets/options/i18n/language.ts @@ -6,7 +6,7 @@ import { t } from "i18next"; const TPL = `

${t("content_language.title")}

-

${t("content_language.description")}

+

${t("content_language.description")}

diff --git a/src/public/app/widgets/type_widgets/options/images/images.ts b/src/public/app/widgets/type_widgets/options/images/images.ts index b7acdd1d8..c5ef57cf9 100644 --- a/src/public/app/widgets/type_widgets/options/images/images.ts +++ b/src/public/app/widgets/type_widgets/options/images/images.ts @@ -18,7 +18,7 @@ const TPL = ` ${t("images.download_images_automatically")} -

${t("images.download_images_description")}

+

${t("images.download_images_description")}


diff --git a/src/public/app/widgets/type_widgets/options/other/attachment_erasure_timeout.ts b/src/public/app/widgets/type_widgets/options/other/attachment_erasure_timeout.ts index 7af216cd0..7ccf51058 100644 --- a/src/public/app/widgets/type_widgets/options/other/attachment_erasure_timeout.ts +++ b/src/public/app/widgets/type_widgets/options/other/attachment_erasure_timeout.ts @@ -8,10 +8,10 @@ const TPL = `

${t("attachment_erasure_timeout.attachment_erasure_timeout")}

-

${t("attachment_erasure_timeout.attachment_auto_deletion_description")}

+

${t("attachment_erasure_timeout.attachment_auto_deletion_description")}

-

${t("attachment_erasure_timeout.manual_erasing_description")}

+

${t("attachment_erasure_timeout.manual_erasing_description")}

`; diff --git a/src/public/app/widgets/type_widgets/options/other/html_import_tags.ts b/src/public/app/widgets/type_widgets/options/other/html_import_tags.ts index 4b1e9fa3a..1b4f559c4 100644 --- a/src/public/app/widgets/type_widgets/options/other/html_import_tags.ts +++ b/src/public/app/widgets/type_widgets/options/other/html_import_tags.ts @@ -112,7 +112,7 @@ const TPL = `

${t("import.html_import_tags.title")}

-

${t("import.html_import_tags.description")}

+

${t("import.html_import_tags.description")}

diff --git a/src/public/app/widgets/type_widgets/options/other/note_erasure_timeout.ts b/src/public/app/widgets/type_widgets/options/other/note_erasure_timeout.ts index 8b5681fcd..1b282e921 100644 --- a/src/public/app/widgets/type_widgets/options/other/note_erasure_timeout.ts +++ b/src/public/app/widgets/type_widgets/options/other/note_erasure_timeout.ts @@ -8,9 +8,9 @@ import TimeSelector from "../time_selector.js"; const TPL = `

${t("note_erasure_timeout.note_erasure_timeout_title")}

-

${t("note_erasure_timeout.note_erasure_description")}

+

${t("note_erasure_timeout.note_erasure_description")}

-

${t("note_erasure_timeout.manual_erasing_description")}

+

${t("note_erasure_timeout.manual_erasing_description")}

`; diff --git a/src/public/app/widgets/type_widgets/options/other/revision_snapshots_limit.ts b/src/public/app/widgets/type_widgets/options/other/revision_snapshots_limit.ts index 835c0a939..fa46eb59b 100644 --- a/src/public/app/widgets/type_widgets/options/other/revision_snapshots_limit.ts +++ b/src/public/app/widgets/type_widgets/options/other/revision_snapshots_limit.ts @@ -8,7 +8,7 @@ const TPL = `

${t("revisions_snapshot_limit.note_revisions_snapshot_limit_title")}

-

${t("revisions_snapshot_limit.note_revisions_snapshot_limit_description")}

+

${t("revisions_snapshot_limit.note_revisions_snapshot_limit_description")}

diff --git a/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts b/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts index dfb16060c..90b5d2485 100644 --- a/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts +++ b/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts @@ -5,7 +5,7 @@ const TPL = `

${t("revisions_snapshot_interval.note_revisions_snapshot_interval_title")}

- +
`; diff --git a/src/public/app/widgets/type_widgets/options/other/search_engine.ts b/src/public/app/widgets/type_widgets/options/other/search_engine.ts index 946cbbbde..dfaf27ecc 100644 --- a/src/public/app/widgets/type_widgets/options/other/search_engine.ts +++ b/src/public/app/widgets/type_widgets/options/other/search_engine.ts @@ -7,7 +7,7 @@ const TPL = `

${t("search_engine.title")}

-

${t("search_engine.custom_search_engine_info")}

+

${t("search_engine.custom_search_engine_info")}

diff --git a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts index 3e5548667..99e8e4f6e 100644 --- a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts +++ b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts @@ -5,7 +5,9 @@ const TPL = `

${t("password.protected_session_timeout")}

-

${t("password.protected_session_timeout_description")} ${t("password.wiki")} ${t("password.for_more_info")}

+

+ ${t("password.protected_session_timeout_description")} ${t("password.wiki")} ${t("password.for_more_info")} +

`; diff --git a/src/public/app/widgets/type_widgets/options/shortcuts.ts b/src/public/app/widgets/type_widgets/options/shortcuts.ts index c8ddf6c0f..179b9325a 100644 --- a/src/public/app/widgets/type_widgets/options/shortcuts.ts +++ b/src/public/app/widgets/type_widgets/options/shortcuts.ts @@ -30,7 +30,7 @@ const TPL = `

${t("shortcuts.keyboard_shortcuts")}

- diff --git a/src/public/app/widgets/type_widgets/options/spellcheck.ts b/src/public/app/widgets/type_widgets/options/spellcheck.ts index 924df3f11..87994909d 100644 --- a/src/public/app/widgets/type_widgets/options/spellcheck.ts +++ b/src/public/app/widgets/type_widgets/options/spellcheck.ts @@ -15,7 +15,7 @@ const TPL_ELECTRON = `

${t("spellcheck.title")}

-

${t("spellcheck.restart-required")}

+

${t("spellcheck.restart-required")}

-

${t("spellcheck.multiple_languages_info")}

+

${t("spellcheck.multiple_languages_info")}

-

${t("spellcheck.available_language_codes_label")}

+

${t("spellcheck.available_language_codes_label")}

`; export default class SpellcheckOptions extends OptionsWidget { diff --git a/src/public/app/widgets/type_widgets/options/sync.ts b/src/public/app/widgets/type_widgets/options/sync.ts index 8e89fd792..e57d07eea 100644 --- a/src/public/app/widgets/type_widgets/options/sync.ts +++ b/src/public/app/widgets/type_widgets/options/sync.ts @@ -23,8 +23,8 @@ const TPL = ` -

${t("sync_2.note")}: ${t("sync_2.note_description")}

-

${t("sync_2.special_value_description")}

+

${t("sync_2.note")}: ${t("sync_2.note_description")}

+

${t("sync_2.special_value_description")}

diff --git a/src/public/app/widgets/type_widgets/options/text_notes/highlights_list.ts b/src/public/app/widgets/type_widgets/options/text_notes/highlights_list.ts index 2e55815e3..3be3d3724 100644 --- a/src/public/app/widgets/type_widgets/options/text_notes/highlights_list.ts +++ b/src/public/app/widgets/type_widgets/options/text_notes/highlights_list.ts @@ -20,9 +20,9 @@ const TPL = `
${t("highlights_list.visibility_title")}
-

${t("highlights_list.visibility_description")}

+

${t("highlights_list.visibility_description")}

-

${t("highlights_list.shortcut_info")}

+

${t("highlights_list.shortcut_info")}

`; export default class HighlightsListOptions extends OptionsWidget { diff --git a/src/public/app/widgets/type_widgets/options/text_notes/table_of_contents.ts b/src/public/app/widgets/type_widgets/options/text_notes/table_of_contents.ts index 8e88f7b4b..87ebae17f 100644 --- a/src/public/app/widgets/type_widgets/options/text_notes/table_of_contents.ts +++ b/src/public/app/widgets/type_widgets/options/text_notes/table_of_contents.ts @@ -12,9 +12,9 @@ const TPL = `
-

${t("table_of_contents.disable_info")}

+

${t("table_of_contents.disable_info")}

-

${t("table_of_contents.shortcut_info")}

+

${t("table_of_contents.shortcut_info")}

`; export default class TableOfContentsOptions extends OptionsWidget { diff --git a/src/public/app/widgets/type_widgets/options/text_notes/text_auto_read_only_size.ts b/src/public/app/widgets/type_widgets/options/text_notes/text_auto_read_only_size.ts index fdf0877c2..7bcd5773f 100644 --- a/src/public/app/widgets/type_widgets/options/text_notes/text_auto_read_only_size.ts +++ b/src/public/app/widgets/type_widgets/options/text_notes/text_auto_read_only_size.ts @@ -6,7 +6,7 @@ const TPL = `

${t("text_auto_read_only_size.title")}

-

${t("text_auto_read_only_size.description")}

+

${t("text_auto_read_only_size.description")}