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

Improve postponed conflict resolution handling

Browse Source 
Keep unresolved conflicts visible after Not now, reopen them only on explicit requests, and clear stale warning and dialogue state when a replicated resolution arrives. Add typed provisional English messages, revision-tree regressions, specifications, and a focused Real Obsidian E2E.
This commit is contained in:
vorotamoroz
2026-07-23 02:00:24 +00:00
parent 8d82a3a00c
commit d784799969
17 changed files with 728 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/adding_translations.md
+12 -1
View File
@@ -31,7 +31,18 @@ Commit the edited YAML and all regenerated JSON and TypeScript resources togethe
## Make a message translatable
1. Add its canonical English entry and translations to `src/common/messagesYAML/`.
LiveSync-owned messages may first be added to
`src/common/messages/LiveSyncProvisionalMessages.ts` while their wording is being
exercised. This keeps an application-only message out of Commonlib and provides a
typed English fallback without requiring contributors to update every language.
When the wording is ready for translation:
1. Move its canonical English entry from
`src/common/messages/LiveSyncProvisionalMessages.ts` to
`src/common/messagesYAML/en.yaml`. Remove the provisional entry in the same
change. Translations in the other LiveSync YAML files may follow as contributor
updates.
2. Replace the source literal with `$msg()` or another existing translation helper, using the English catalogue key as the typed contract.
3. Run `npm run i18n:bake`, build the plug-in, and verify the affected workflow.