From c9df53361c3b748a60afc6c7c66e5ef38c6e8eba Mon Sep 17 00:00:00 2001 From: PScoriae Date: Sat, 16 Dec 2023 12:14:16 +0800 Subject: [PATCH 1/3] feat: add formatMinutes function --- src/utils.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/utils.ts b/src/utils.ts index b44ce1f3..3f2fa45d 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -108,3 +108,8 @@ export function getDisplayPath(path: string): string { if (path.endsWith("/")) return path; return path.split("/").last()!.replace(".md", ""); } + +export function formatMinutes(minutes: number): string { + if (minutes === 1) return "1 minute"; + return `${minutes} minutes`; +} From 9267feec3dd3b725f81992b912d17ef82fe53dab Mon Sep 17 00:00:00 2001 From: PScoriae Date: Sat, 16 Dec 2023 11:02:49 +0800 Subject: [PATCH 2/3] fix: update backup interval notice grammar - use "minute" when autoSaveInterval is 1 - else use "minutes" - uses the formatMinutes function --- src/setting/settings.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/setting/settings.ts b/src/setting/settings.ts index a7d12197..dfbb13f2 100644 --- a/src/setting/settings.ts +++ b/src/setting/settings.ts @@ -23,7 +23,7 @@ import { } from "src/lineAuthor/model"; import ObsidianGit from "src/main"; import { ObsidianGitSettings, SyncMethod } from "src/types"; -import { convertToRgb, rgbToString } from "src/utils"; +import { convertToRgb, rgbToString, formatMinutes } from "src/utils"; const FORMAT_STRING_REFERENCE_URL = "https://momentjs.com/docs/#/parsing/string-format/"; @@ -110,7 +110,7 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { plugin.settings.autoSaveInterval ); new Notice( - `Automatic ${commitOrBackup} enabled! Every ${plugin.settings.autoSaveInterval} minutes.` + `Automatic ${commitOrBackup} enabled! Every ${formatMinutes(plugin.settings.autoSaveInterval)}.` ); } else if ( plugin.settings.autoSaveInterval <= 0 @@ -128,9 +128,11 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { if (!plugin.settings.setLastSaveToLastCommit) new Setting(containerEl) - .setName(`Auto Backup after stop editing any file`) + .setName(`Auto Backup after stopping file edits`) .setDesc( - `Requires the ${commitOrBackup} interval not to be 0. If turned on, do auto ${commitOrBackup} every ${plugin.settings.autoSaveInterval} minutes after stop editing any file. This also prevents auto ${commitOrBackup} while editing a file. If turned off, it's independent from the last change.` + `Requires the ${commitOrBackup} interval not to be 0. + If turned on, do auto ${commitOrBackup} every ${formatMinutes(plugin.settings.autoSaveInterval)} after stopping file edits. + This also prevents auto ${commitOrBackup} while editing a file. If turned off, it's independent from the last change.` ) .addToggle((toggle) => toggle @@ -188,7 +190,7 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { plugin.settings.autoPushInterval ); new Notice( - `Automatic push enabled! Every ${plugin.settings.autoPushInterval} minutes.` + `Automatic push enabled! Every ${formatMinutes(plugin.settings.autoPushInterval)}.` ); } else if ( plugin.settings.autoPushInterval <= 0 @@ -227,7 +229,7 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { plugin.settings.autoPullInterval ); new Notice( - `Automatic pull enabled! Every ${plugin.settings.autoPullInterval} minutes.` + `Automatic pull enabled! Every ${formatMinutes(plugin.settings.autoPullInterval)}.` ); } else if ( plugin.settings.autoPullInterval <= 0 From 3082b02e7008cb2776ec3d277eebe2accf1916a3 Mon Sep 17 00:00:00 2001 From: PScoriae Date: Sat, 23 Dec 2023 13:28:09 +0800 Subject: [PATCH 3/3] fix(style): run prettier format --- src/setting/settings.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/setting/settings.ts b/src/setting/settings.ts index dfbb13f2..582ae97c 100644 --- a/src/setting/settings.ts +++ b/src/setting/settings.ts @@ -110,7 +110,9 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { plugin.settings.autoSaveInterval ); new Notice( - `Automatic ${commitOrBackup} enabled! Every ${formatMinutes(plugin.settings.autoSaveInterval)}.` + `Automatic ${commitOrBackup} enabled! Every ${formatMinutes( + plugin.settings.autoSaveInterval + )}.` ); } else if ( plugin.settings.autoSaveInterval <= 0 @@ -131,7 +133,9 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { .setName(`Auto Backup after stopping file edits`) .setDesc( `Requires the ${commitOrBackup} interval not to be 0. - If turned on, do auto ${commitOrBackup} every ${formatMinutes(plugin.settings.autoSaveInterval)} after stopping file edits. + If turned on, do auto ${commitOrBackup} every ${formatMinutes( + plugin.settings.autoSaveInterval + )} after stopping file edits. This also prevents auto ${commitOrBackup} while editing a file. If turned off, it's independent from the last change.` ) .addToggle((toggle) => @@ -190,7 +194,9 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { plugin.settings.autoPushInterval ); new Notice( - `Automatic push enabled! Every ${formatMinutes(plugin.settings.autoPushInterval)}.` + `Automatic push enabled! Every ${formatMinutes( + plugin.settings.autoPushInterval + )}.` ); } else if ( plugin.settings.autoPushInterval <= 0 @@ -229,7 +235,9 @@ export class ObsidianGitSettingsTab extends PluginSettingTab { plugin.settings.autoPullInterval ); new Notice( - `Automatic pull enabled! Every ${formatMinutes(plugin.settings.autoPullInterval)}.` + `Automatic pull enabled! Every ${formatMinutes( + plugin.settings.autoPullInterval + )}.` ); } else if ( plugin.settings.autoPullInterval <= 0