mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-08-11 22:25:46 +00:00
ZeedifandClaude Opus 5
b6746be73e
Continues the source-key migration inside the application boundary introduced in 1.0.0, where LiveSync owns its catalogue and consumes Commonlib as a published package. - Replace hardcoded user-visible strings in the Obsidian UI (Setup Wizard dialogues, P2P panes, Customisation Sync panes, Global History, the JSON conflict pane and the remote-configuration menu) with `$msg` calls, keeping the English source string as the key. - Wire up strings whose translations already existed in the catalogue but were still rendered as literals, for example the whole Intro dialogue. - Add the new entries to `src/common/messagesYAML/en.yaml` and `es.yaml`, then regenerate `messagesJson/` and `combinedMessages.prod.ts` through the documented `i18n:bake` pipeline. - No Commonlib gitlink or catalogue is involved; every change is LiveSync-owned. Regenerating the catalogue also normalises three pre-existing entries each in `ko.json` and `zh.json`, where the committed JSON kept a trailing space before a newline that YAML cannot represent. Verified with tsc-check, tsc-check:apps, svelte-check and lint. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
83 lines
3.6 KiB
Svelte
83 lines
3.6 KiB
Svelte
<script lang="ts">
|
|
import DialogHeader from "@/modules/services/LiveSyncUI/components/DialogHeader.svelte";
|
|
import Guidance from "@/modules/services/LiveSyncUI/components/Guidance.svelte";
|
|
import Decision from "@/modules/services/LiveSyncUI/components/Decision.svelte";
|
|
import Question from "@/modules/services/LiveSyncUI/components/Question.svelte";
|
|
import Instruction from "@/modules/services/LiveSyncUI/components/Instruction.svelte";
|
|
import UserDecisions from "@/modules/services/LiveSyncUI/components/UserDecisions.svelte";
|
|
import { $msg as translateMessage } from "@/common/translation";
|
|
|
|
import { TYPE_CANCELLED, TYPE_APPLY, type OutroExistingUserResultType } from "./setupDialogTypes";
|
|
type Props = {
|
|
setResult: (result: OutroExistingUserResultType) => void;
|
|
getInitialData?: () => { isP2P?: boolean } | undefined;
|
|
};
|
|
const { setResult, getInitialData }: Props = $props();
|
|
const isP2P = $derived(getInitialData?.()?.isP2P === true);
|
|
</script>
|
|
|
|
{#if isP2P}
|
|
<DialogHeader title={translateMessage("Setup Complete: Preparing to Fetch from Another Device")} />
|
|
<Guidance>
|
|
<p>
|
|
{translateMessage(
|
|
"The P2P connection has been configured successfully. The initial synchronisation data must now be fetched from an online source device."
|
|
)}
|
|
</p>
|
|
<p>
|
|
<strong>{translateMessage("PLEASE NOTE")}</strong>
|
|
<br />
|
|
{translateMessage(
|
|
"After restarting, select an online source device for the initial Fetch. The local LiveSync database on this device will be rebuilt from that source. Unsynchronised files in this Vault may conflict with the fetched data."
|
|
)}
|
|
</p>
|
|
</Guidance>
|
|
<Instruction>
|
|
<Question>
|
|
{translateMessage("Restart this device, then choose the source device when P2P Rebuild opens.")}
|
|
</Question>
|
|
</Instruction>
|
|
<UserDecisions>
|
|
<Decision
|
|
title={translateMessage("Restart and Select Source Device")}
|
|
important={true}
|
|
commit={() => setResult(TYPE_APPLY)}
|
|
/>
|
|
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
|
</UserDecisions>
|
|
{:else}
|
|
<DialogHeader title={translateMessage("Setup Complete: Preparing to Fetch Synchronisation Data")} />
|
|
<Guidance>
|
|
<p>
|
|
{translateMessage("The connection to the server has been configured successfully. As the next step,")}
|
|
<strong
|
|
>{translateMessage(
|
|
"the latest synchronisation data will be downloaded from the server to this device."
|
|
)}</strong
|
|
>
|
|
</p>
|
|
<p>
|
|
<strong>{translateMessage("PLEASE NOTE")}</strong>
|
|
<br />
|
|
{translateMessage(
|
|
"After restarting, the database on this device will be rebuilt using data from the server. If there are any unsynchronised files in this vault, conflicts may occur with the server data."
|
|
)}
|
|
</p>
|
|
</Guidance>
|
|
<Instruction>
|
|
<Question
|
|
>{translateMessage(
|
|
"Please select the button below to restart and proceed to the data fetching confirmation."
|
|
)}</Question
|
|
>
|
|
</Instruction>
|
|
<UserDecisions>
|
|
<Decision
|
|
title={translateMessage("Restart and Fetch Data")}
|
|
important={true}
|
|
commit={() => setResult(TYPE_APPLY)}
|
|
/>
|
|
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
|
</UserDecisions>
|
|
{/if}
|