public/obsidian-livesync
1
0 Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-10-26 11:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify device review guidance and follow dialogue windows

Browse Source
This commit is contained in:
vorotamoroz committed 2026-10-23 16:07:35 +00:00
1 parent 76808878da
commit 39ef429d7b
7 files changed
+81 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/common/messages/LiveSyncProvisionalMessages.ts
+7 -6
View File
@@ -26,8 +26,8 @@ export const liveSyncProvisionalEnglishMessages = {
"This remote does not currently have a record of joined devices.",
"This list shows device information recorded by the remote. It does not show whether a device is online now.":
"This list shows device information recorded by the remote. It does not show whether a device is online now.",
"This device is locked out. Use the existing recovery process to join again.":
"This device is locked out. Use the existing recovery process to join again.",
"This device has been locked out. Use the existing recovery process to join again.":
"This device has been locked out. Use the existing recovery process to join again.",
"This device": "This device",
"This remote has been cleaned. Use the existing recovery process to join devices again as needed.":
"This remote has been cleaned. Use the existing recovery process to join devices again as needed.",
@@ -42,10 +42,10 @@ export const liveSyncProvisionalEnglishMessages = {
Refresh: "Refresh",
"Plug-in version": "Plug-in version",
Platform: "Platform",
"Other joined devices last reported an older plug-in version: ${versions}.":
"Other joined devices last reported an older plug-in version: ${versions}.",
"Other joined devices last reported a newer plug-in version: ${versions}.":
"Other joined devices last reported a newer plug-in version: ${versions}.",
"An older plug-in version was detected in other device records: ${versions}. We recommend checking whether those devices need updating.":
"An older plug-in version was detected in other device records: ${versions}. We recommend checking whether those devices need updating.",
"A newer plug-in version was detected in other device records: ${versions}. We recommend checking whether this device needs updating.":
"A newer plug-in version was detected in other device records: ${versions}. We recommend checking whether this device needs updating.",
Open: "Open",
"Not recorded": "Not recorded",
"Not accepted": "Not accepted",
@@ -58,6 +58,7 @@ export const liveSyncProvisionalEnglishMessages = {
"Joined devices are available after database startup with an active CouchDB or Object Storage connection.":
"Joined devices are available after database startup with an active CouchDB or Object Storage connection.",
"Joined devices": "Joined devices",
"Review devices": "Review devices",
"Forgetting…": "Forgetting…",
"Forgetting the record does not delete Vault files or revoke credentials.":
"Forgetting the record does not delete Vault files or revoke credentials.",
src/modules/features/SettingDialogue/PaneRemoteConfig.ts
+1 -1
View File
@@ -106,7 +106,7 @@ export function paneRemoteConfig(
.setName($msg("Joined devices"))
.setDesc($msg("Review device records for the active CouchDB or Object Storage connection."))
.addButton((button) =>
button.setButtonText($msg("Open")).onClick(async () => {
button.setButtonText($msg("Review devices")).onClick(async () => {
const result = await this.services.UI.commands.invoke(OPEN_JOINED_DEVICES, undefined);
if (result.status === "unavailable" || result.value === "unavailable") {
this.services.API.addLog(
src/modules/services/LiveSyncUI/dialogues/JoinedDevicesDialog.svelte
+1 -1
View File
@@ -176,7 +176,7 @@
{#if device.self && device.lockedOut}
<p class="state-message">
{translate(
"This device is locked out. Use the existing recovery process to join again."
"This device has been locked out. Use the existing recovery process to join again."
)}
</p>
{/if}
src/serviceFeatures/useJoinedDevices.ts
+14 -8
View File
@@ -62,14 +62,20 @@ export function useJoinedDevicesFeature(host: JoinedDevicesHost, notices: Obsidi
notices.setItem(noticeGroup, direction, {
message:
direction === "newer"
? $msg("Other joined devices last reported a newer plug-in version: ${versions}.", {
versions: versions.join(", "),
})
: $msg("Other joined devices last reported an older plug-in version: ${versions}.", {
versions: versions.join(", "),
}),
? $msg(
"A newer plug-in version was detected in other device records: ${versions}. We recommend checking whether this device needs updating.",
{
versions: versions.join(", "),
}
)
: $msg(
"An older plug-in version was detected in other device records: ${versions}. We recommend checking whether those devices need updating.",
{
versions: versions.join(", "),
}
),
action: {
label: $msg("Joined devices"),
label: $msg("Review devices"),
onSelect: () => {
if (!disposed && identity === remoteIdentity(services.setting.currentSettings())) {
void services.UI.commands.invoke(OPEN_JOINED_DEVICES, undefined);
@@ -190,7 +196,7 @@ export function useJoinedDevicesFeature(host: JoinedDevicesHost, notices: Obsidi
services.appLifecycle.onInitialise.addHandler(() => {
services.API.addCommand({
id: "joined-devices",
name: $msg("Joined devices"),
name: $msg("Review devices"),
icon: "monitor-smartphone",
checkCallback: (checking) => {
if (!available()) return false;