public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2025-12-13 09:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change a few more lines to more correctly reflect the settings

Browse Source
This commit is contained in:
Volkor
2024-11-27 23:39:47 +11:00
parent 7eceab59af
commit 71987e6814
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/features/ModuleSetupObsidian.ts
View File

@@ -142,7 +142,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
const setupJustImport = "Don't sync anything, just apply the settings.";
const setupAsNew = "This is a new client - sync everything from the remote server.";
const setupAsMerge = "This is an existing client - merge existing files with the server.";
const setupAgain = "This is a new server - reset remote server and use local files.";
const setupAgain = "Initialise new server data - ideal for new or broken servers.";
const setupManually = "Continue and configure manually.";
newSettingW.syncInternalFiles = false;
newSettingW.usePluginSync = false;

10
src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts
View File

@@ -940,7 +940,7 @@ Store only the settings. **Caution: This may lead to data corruption**; database
});
new Setting(paneEl)
.setName("Enable LiveSync")
.setDesc("Only enable this after configuring either of the above two options.")
.setDesc("Only enable this after configuring either of the above two options or completing all configuration manually.")
.addOnUpdate(visibleOnly(() => !this.isConfiguredAs("isConfigured", true)))
.addButton((text) => {
text.setButtonText("Enable").onClick(async () => {
@@ -1357,7 +1357,7 @@ Store only the settings. **Caution: This may lead to data corruption**; database
const ObjectStorageMessage = `WARNING: This feature is a Work In Progress, so please keep in mind the following:
- Append only architecture. A rebuild is required to shrink the storage.
- A bit fragile.
- When first syncing, all history will be transferred from the server. Be mindful of data caps and slow speeds.
- When first syncing, all history will be transferred from the remote. Be mindful of data caps and slow speeds.
- Only differences are synced live.
If you run into any issues, or have ideas about this feature, please create a issue on GitHub.
@@ -1533,8 +1533,8 @@ I appreciate you for your great dedication.
void addPanel(paneEl, "Fetch settings").then((paneEl) => {
new Setting(paneEl)
.setName("Fetch config from server")
.setDesc("Fetch necessary settings from already configured server.")
.setName("Fetch config from remote server")
.setDesc("Fetch necessary settings from already configured remote server.")
.addButton((button) =>
button
.setButtonText("Fetch")
@@ -1599,7 +1599,7 @@ I appreciate you for your great dedication.
}
if (
(await this.plugin.confirm.askYesNoDialog(
"Do you want to fetch the config from the server?",
"Do you want to fetch the config from the remote server?",
{ defaultOption: "Yes", title: "Fetch config" }
)) == "yes"
) {

10
src/modules/features/SettingDialogue/settingConstants.ts
View File

@@ -105,11 +105,11 @@ export const SettingInformation: Partial<Record<keyof AllSettings, Configuration
},
syncOnSave: {
name: "Sync on Save",
desc: "Forces a sync of the file when it's saved.",
desc: "Starts synchronisation when a file is saved.",
},
syncOnEditorSave: {
name: "Sync on Editor Save",
desc: "When you save a file in the editor, sync automatically",
desc: "When you save a file in the editor, start a sync automatically",
},
syncOnFileOpen: {
name: "Sync on File Open",
@@ -148,8 +148,8 @@ export const SettingInformation: Partial<Record<keyof AllSettings, Configuration
desc: "Should we prompt you for every single merge, even if we can safely merge automatcially?",
},
writeDocumentsIfConflicted: {
name: "Sync changes even if the file has a conflict.",
desc: "Turn on to previous behavior",
name: "Apply Latest Change if Conflicting",
desc: "Enable this option to automatically apply the most recent change to documents even when it conflicts",
},
syncInternalFilesInterval: {
name: "Scan hidden files periodically",
@@ -261,7 +261,7 @@ export const SettingInformation: Partial<Record<keyof AllSettings, Configuration
},
useCustomRequestHandler: {
name: "Use Custom HTTP Handler",
desc: "Enable this if your Object Storage doesn't accept CORS",
desc: "Enable this if your Object Storage doesn't support CORS",
},
maxChunksInEden: {
name: "Maximum Incubating Chunks",