Used some more variables to help with white labeling (#976)

paranext · Jul 2, 2024 · edce560 · edce560
2 parents c8f81d2 + 93f1f3b
commit edce560
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 38 deletions.
diff --git a/.github/workflows/package-main.yml b/.github/workflows/package-main.yml
@@ -65,7 +65,7 @@ jobs:
           CURRENT_VERSION=$(node -pe "require('./package.json').version")
           NEW_VERSION="${CURRENT_VERSION}-commit.${COMMIT_HASH}"
           echo "Updating version from ${CURRENT_VERSION} to ${NEW_VERSION}"
-          npm version $NEW_VERSION
+          npm --no-git-tag-version version $NEW_VERSION
 
       - name: Publish releases - Windows
         if: ${{ matrix.os == 'windows-latest' }}

diff --git a/assets/localization/en.json b/assets/localization/en.json
@@ -1,4 +1,5 @@
 {
+  "%product_name%": "Platform.Bible",
   "%insertNote%": "Insert Note",
   "%mainMenu_aboutPlatformBible%": "About Platform.Bible",
   "%mainMenu_downloadSlashInstallResources%": "Download/Install Resources",

diff --git a/electron-builder.json5 b/electron-builder.json5
@@ -4,6 +4,7 @@
 {
   productName: 'Platform.Bible',
   appId: 'org.paranext.PlatformBible',
+  copyright: 'Copyright (c) 2022-2024 SIL International',
   asar: true,
   asarUnpack: '**\\*.{node,dll}',
   files: ['dist', 'node_modules', 'package.json'],

diff --git a/...c/platform-scripture/src/project-data-provider/platform-scripture-extender-pdpef.model.ts b/...c/platform-scripture/src/project-data-provider/platform-scripture-extender-pdpef.model.ts
@@ -10,11 +10,17 @@ import ScriptureExtenderProjectDataProviderEngine, {
 /** PDP Factory ID for the Scripture Extender PDPF */
 export const SCRIPTURE_EXTENDER_PDPF_ID = 'platformScripture.scriptureExtenderPdpf';
 
-/** Regex strings for the project interfaces the Scripture Extender Layering PDPF layers over */
-const SCRIPTURE_EXTENDER_OVERLAY_PROJECT_INTERFACES_REGEX_STRINGS =
+/**
+ * Regex strings for the project interfaces the Scripture Extender Layering PDPF layers over
+ *
+ * Need to wrap in an array to AND the interfaces together since this Layering PDPF only supports
+ * projects that have all three interfaces available
+ */
+const SCRIPTURE_EXTENDER_OVERLAY_PROJECT_INTERFACES_REGEX_STRINGS = [
   SCRIPTURE_EXTENDER_OVERLAY_PROJECT_INTERFACES.map((projectInterface) =>
     escapeStringRegexp(projectInterface),
-  );
+  ),
+];
 
 class ScriptureExtenderProjectDataProviderEngineFactory
   extends LayeringProjectDataProviderEngineFactory<typeof SCRIPTURE_EXTENDER_PROJECT_INTERFACES>

diff --git a/extensions/src/usfm-data-provider/index.d.ts b/extensions/src/usfm-data-provider/index.d.ts
diff --git a/extensions/src/usfm-data-provider/manifest.json b/extensions/src/usfm-data-provider/manifest.json
diff --git a/src/renderer/app.component.scss b/src/renderer/app.component.scss
@@ -57,7 +57,12 @@ a:hover {
 .about-panel {
   width: 100%;
   height: 100%;
-  background: linear-gradient(200.96deg, #b8d432 -29.09%, #5f7333 51.77%, #47314e 129.35%);
+  background: linear-gradient(
+    200.96deg,
+    $color--pt9-lightgreen -10%,
+    $color--pt9-darkgreen 60%,
+    $color--pt9-darkgray 110%
+  );
   overflow-y: auto;
 }
 

diff --git a/src/renderer/index.ejs b/src/renderer/index.ejs
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />

diff --git a/src/renderer/testing/about-panel.component.tsx b/src/renderer/testing/about-panel.component.tsx
@@ -1,16 +1,22 @@
 import icon from '@assets/icon.png';
+import { useLocalizedStrings } from '@renderer/hooks/papi-hooks';
 import { SavedTabInfo, TabInfo } from '@shared/models/docking-framework.model';
+import { LocalizeKey } from 'platform-bible-utils';
 
 export const TAB_TYPE_ABOUT = 'about';
 
+const STRING_KEYS: LocalizeKey[] = ['%product_name%'];
+
 export default function AboutPanel() {
+  const [{ '%product_name%': productName }] = useLocalizedStrings(STRING_KEYS);
+
   return (
     <div className="about-panel">
       <div className="hello">
         <img width="200" alt="icon" src={icon} />
       </div>
       <div className="hello">
-        <h1>Platform.Bible</h1>
+        <h1>{productName}</h1>
       </div>
     </div>
   );