Merge branch 'main' into add-multiselect-to-combobox

paranext · Nov 25, 2024 · 69e46c9 · 69e46c9
2 parents 2087fd5 + 830cca4
commit 69e46c9
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 344 deletions.
diff --git a/extensions/src/legacy-comment-manager/package.json b/extensions/src/legacy-comment-manager/package.json
@@ -34,7 +34,7 @@
     "react-dom": ">=18.3.1"
   },
   "dependencies": {
-    "@biblionexus-foundation/scripture-utilities": "^0.0.4",
+    "@biblionexus-foundation/scripture-utilities": "~0.0.5",
     "@sillsdev/scripture": "^2.0.2",
     "platform-bible-utils": "file:../../../lib/platform-bible-utils"
   },

diff --git a/extensions/src/paratext-registration/contributions/localizedStrings.json b/extensions/src/paratext-registration/contributions/localizedStrings.json
@@ -58,6 +58,7 @@
       "%paratextRegistration_description_internetUse_option_Disabled%": "Disable all Internet use",
       "%paratextRegistration_description_internetUse_option_ProxyOnly%": "Use a proxy",
       "%paratextRegistration_description_internetUse_option_VpnRequired%": "Disable Internet use in sensitive locations",
+      "%paratextRegistration_description_shared_with_paratext_9%": "Theses settings also apply to Paratext 9.",
       "%paratextRegistration_label_emailAddress%": "Email address",
       "%paratextRegistration_label_proxyHost%": "Host",
       "%paratextRegistration_label_proxyMode%": "Mode",

diff --git a/extensions/src/paratext-registration/src/paratext-registration.web-view.tsx b/extensions/src/paratext-registration/src/paratext-registration.web-view.tsx
@@ -150,6 +150,7 @@ const LOCALIZED_STRING_KEYS: LocalizeKey[] = [
   '%paratextRegistration_button_saveAndRestart%',
   '%paratextRegistration_description_internetUse_disclaimer%',
   ...INTERNET_USE_OPTIONS.map(getLocalizeKeyForInternetUse),
+  '%paratextRegistration_description_shared_with_paratext_9%',
   '%paratextRegistration_label_emailAddress%',
   '%paratextRegistration_label_proxyHost%',
   '%paratextRegistration_label_proxyMode%',
@@ -307,6 +308,9 @@ globalThis.webViewComponent = function ParatextRegistration({ useWebViewState }:
   return (
     <div className="tw-p-2 tw-flex tw-flex-col tw-justify-between tw-h-screen">
       <div>
+        <div className="tw-ms-2 tw-text-sm tw-text-muted-foreground">
+          {localizedStrings['%paratextRegistration_description_shared_with_paratext_9%']}
+        </div>
         <Grid>
           <span>{localizedStrings['%paratextRegistration_label_registrationName%']}</span>
           <Input value={name} disabled={isFormDisabled} onChange={(e) => setName(e.target.value)} />

diff --git a/extensions/src/platform-scripture-editor/package.json b/extensions/src/platform-scripture-editor/package.json
@@ -38,8 +38,8 @@
     "platform-bible-utils": "file:../../../lib/platform-bible-utils"
   },
   "devDependencies": {
-    "@biblionexus-foundation/platform-editor": "^0.6.5",
-    "@biblionexus-foundation/scripture-utilities": "^0.0.4",
+    "@biblionexus-foundation/platform-editor": "~0.6.6",
+    "@biblionexus-foundation/scripture-utilities": "~0.0.5",
     "@swc/core": "^1.7.35",
     "@tailwindcss/typography": "^0.5.15",
     "@types/node": "^20.16.11",

diff --git a/extensions/src/platform-scripture-editor/src/platform-scripture-editor.web-view.tsx b/extensions/src/platform-scripture-editor/src/platform-scripture-editor.web-view.tsx
@@ -6,7 +6,12 @@ import {
   Marginal,
   MarginalRef,
 } from '@biblionexus-foundation/platform-editor';
-import { MarkerContent, Usj } from '@biblionexus-foundation/scripture-utilities';
+import {
+  MarkerContent,
+  USJ_TYPE,
+  USJ_VERSION,
+  Usj,
+} from '@biblionexus-foundation/scripture-utilities';
 import { Canon, VerseRef } from '@sillsdev/scripture';
 import { JSX, useCallback, useEffect, useMemo, useRef } from 'react';
 import type { WebViewProps } from '@papi/core';
@@ -32,7 +37,7 @@ const VERSE_NUMBER_SCROLL_OFFSET = 80;
  */
 const EDITOR_LOAD_DELAY_TIME = 100;
 
-const usjDocumentDefault: Usj = { type: 'USJ', version: '0.2.1', content: [] };
+const defaultUsj: Usj = { type: USJ_TYPE, version: USJ_VERSION, content: [] };
 
 /**
  * Check deep equality of two values such that two equal objects or arrays created in two different
@@ -107,7 +112,7 @@ globalThis.webViewComponent = function PlatformScriptureEditor({
     projectId,
   ).ChapterUSJ(
     useMemo(() => new VerseRef(scrRef.bookNum, scrRef.chapterNum, scrRef.verseNum), [scrRef]),
-    usjDocumentDefault,
+    defaultUsj,
   );
 
   const usjSentToPdp = useRef(usjFromPdp);

diff --git a/extensions/src/platform-scripture/package.json b/extensions/src/platform-scripture/package.json
@@ -39,7 +39,7 @@
     "platform-bible-utils": "file:../../../lib/platform-bible-utils"
   },
   "devDependencies": {
-    "@biblionexus-foundation/scripture-utilities": "^0.0.4",
+    "@biblionexus-foundation/scripture-utilities": "~0.0.5",
     "@swc/core": "^1.7.35",
     "@tailwindcss/typography": "^0.5.15",
     "@types/jest": "^29.5.14",