Handle multiple conflict revisions deterministically

src/common/messages/LiveSyncProvisionalMessages.ts

@@ -8,6 +8,8 @@
  */
 export const liveSyncProvisionalEnglishMessages = {
     "This file has unresolved conflicts.": "This file has unresolved conflicts.",
+    "This file has ${COUNT} unresolved versions. They will be reviewed one pair at a time.":
+        "This file has ${COUNT} unresolved versions. They will be reviewed one pair at a time.",
 } as const;
 
 export type LiveSyncProvisionalMessageKey = keyof typeof liveSyncProvisionalEnglishMessages;

src/common/translation.ts

@@ -143,6 +143,6 @@ export function $msg<T extends AllMessageKeys>(
 export type LiveSyncMessageTranslator = MessageTranslator<AllMessageKeys>;
 
 export const translateLiveSyncMessage: LiveSyncMessageTranslator = (key, params) => {
-    if (!isLiveSyncMessageKey(key)) return englishMessageTranslator(key as CommonlibMessageKey, params);
+    if (!isLiveSyncMessageKey(key)) return englishMessageTranslator(key, params);
     return $msg(key, params === undefined ? undefined : { ...params });
 };

src/common/translation.unit.spec.ts

@@ -28,6 +28,11 @@ describe("LiveSync-owned translation catalogue", () => {
 
     it("uses LiveSync-owned provisional English without extending Commonlib's message contract", () => {
         expect($msg("This file has unresolved conflicts.")).toBe("This file has unresolved conflicts.");
+        expect(
+            $msg("This file has ${COUNT} unresolved versions. They will be reviewed one pair at a time.", {
+                COUNT: "3",
+            })
+        ).toBe("This file has 3 unresolved versions. They will be reviewed one pair at a time.");
         expect(translateLiveSyncMessage("This file has unresolved conflicts.")).toBe(
             "This file has unresolved conflicts."
         );