Merge release 3.6.2 into master (#7558)

* update change log

* add jsdoc generation to github actions

* fix jsdocs generation

* fix jsdocs generation. fix some jsdocs

* fix jsdocs generation. fix some jsdocs.

* fix jsdocs folder name

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* working on adding jsDocs to github pages

* README.md cleanup

* README.md cleanup

* remove the git version update code which does not succeed.

* fix github actions

* cleanup github actions

* fix git commit of jsdocs

* fix git commit of jsdocs

* updated container

* tweak logging

* back out fix the npm cache

* fix for committing jsdocs

* fix for build errors

* fix for build errors

* fix for build errors

* create output folder with permissions

* create output folder with permissions

* fix for test errors

* fix for test errors

* fix for test errors

* fix for test errors

* fix access errors for js docs

* fix access errors for js docs

* fix chapter justification for ltr languages.

* update to 3.5.1

* fix jsdocs generation - need permission to write to docs folder

* fix jsdocs generation - need permission to write to docs folder

* fix jsdocs generation - need permission to write to docs folder

* comments

* removed push of jsdocs changes back into branch

* fix access errors for js docs

* update change log

* update change log

* fix access errors for js docs

* updated docker container

* exclude test folder.

* fix for test failure

* fix for test failure

* fix for test failure

* fix for test failure

* fix for test failure

* Feature / update electronite to v25.3.2 (#7530)

* trying updated electronite

* testing

* trying updated electronite

* update to use electronite 25.3.2

* update to use electronite 23.3.10

---------

Co-authored-by: blm <[email protected]>

* feature / updated tc-source-content-updater to use the latest catalog URLs (#7531)

* updated tc-source-content-updater to use the latest catalog URLs

* bump version

---------

Co-authored-by: blm <[email protected]>

* Feature / fix URL for catalog (#7532)

* updated tc-source-content-updater to use the latest catalog URLs

* bump version

* bump version

* updated tc-source-content-updater to use the latest catalog URLs

* Revert "bump version"

This reverts commit 80fbb45.

* bump version

* bump version

* updated tc-source-content-updater to use the latest catalog URLs

* updated tc-source-content-updater to use the latest catalog URLs

* updated tc-source-content-updater to use the latest catalog URLs

* updated resources

---------

Co-authored-by: blm <[email protected]>

* Bugfix 7533/broken preview paragraph (#7534)

* fix charis definition

* fix print preview for case missing paragraph marker before

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Feature 7536 / front matter alignment support (#7538)

* fixes for front matter alignment

* update resources

* fix to migrate original language bible on upgrade of version.
fix to export front matter alignments

* fix migration unit tests to match replacement of original language bibles parsed with older tC versions.

* fix migration to remove derived original language translationWords.

* Clean up highlight colors in log file.

* Clean up

* bump version

* updated dependencies

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Feature 5885 / alignment enhancements (#7542)

* updated word alignment tool

* updated locales

* updated translation helps tools

* updated tools

* updated tools

* updated tools

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* updated CHANGELOG.md (#7544)

Co-authored-by: PhotoNomad0 <[email protected]>

* bugfix 7546 / fix creating WA group data - allow for verses to be string format (#7547)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix mcleanb 7546 fix verse span support (#7549)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

* add unit tests to check for verse span in WA group data

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix 7555 / multiselect bug (#7556)

* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* change default upgrade of macos arm64 to universal

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

* update unit tests for arm64 update

* update unit tests

* update wordAlignment

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>

---------

Co-authored-by: blm <[email protected]>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "translationCore",
   "productName": "translationCore",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "minCompatibleVersion": "3.6.0",
   "manifestVersion": "8",
   "description": "A bridge between TS and TM",

src/__tests__/CheckSoftwareUpdatesDialog.test.js

@@ -104,13 +104,13 @@ describe('Get update asset', () => {
       tag_name: '2.0.0',
       assets: [{
         extra_info: 'bar',
-        name: 'translationCore-macos-x64-2.0.0.exe',
+        name: 'translationCore-macos-universal-2.0.0.exe',
       }],
     };
     const expectedUpdate = {
       extra_info: 'bar',
       installed_version: '1.0.0',
-      name: 'translationCore-macos-x64-2.0.0.exe',
+      name: 'translationCore-macos-universal-2.0.0.exe',
       latest_version: '2.0.0',
     };
     const expectedUpToDate = false;

src/__tests__/ResourcesHelpers.test.js

@@ -14,9 +14,12 @@ import {
   STATIC_RESOURCES_PATH,
   TRANSLATION_WORDS,
 } from '../js/common/constants';
+import ProjectAPI from '../js/helpers/ProjectAPI';
 
 const resourcesDir = path.join(__dirname, 'fixtures', 'resources');
 const latestVersionTestDir = path.join('src', '__tests__', 'fixtures', 'latestVersionTest');
+const ust_1jn_dir = path.join(__dirname, 'fixtures/project/en_ust_1jn');
+const ust_1jn_TestDir = path.join('src', '__tests__', 'fixtures/project/en_ust_1jn');
 
 describe('ResourcesHelpers.', () => {
   beforeAll(() => {
@@ -25,6 +28,7 @@ describe('ResourcesHelpers.', () => {
     fs.__loadDirIntoMockFs(STATIC_RESOURCES_PATH, STATIC_RESOURCES_PATH);
     fs.__loadDirIntoMockFs(resourcesDir, resourcesDir);
     fs.__loadDirIntoMockFs(latestVersionTestDir, latestVersionTestDir);
+    fs.__loadDirIntoMockFs(ust_1jn_dir, ust_1jn_TestDir);
   });
 
   describe('chapterGroupsIndex', () => {
@@ -59,6 +63,36 @@ describe('ResourcesHelpers.', () => {
       expect(output[2][14].contextId.tool).toBe('toolTemplate');
       expect(output[2][14].contextId.groupId).toBe('chapter_3');
     });
+
+    it('should work with verse span', () => {
+      const project = new ProjectAPI(ust_1jn_TestDir);
+      const bookDataDir = project.getBookDataDir();
+      const output = generateChapterGroupData('1jn', 'wordAlignment', bookDataDir);
+      expect(output.constructor).toBe(Array);
+      const chapterLength = 5;
+      expect(output.length).toEqual(chapterLength);
+      const testChapter = '3';
+      const chapter3 = output[2];
+      const expectedVerseCount = 23;
+      expect(chapter3.length).toEqual(expectedVerseCount);
+
+      for (let v = 0; v < expectedVerseCount; v++) {
+        const verseData = chapter3[v];
+        let expectedVerse = `${v+1}`;
+
+        if (v === 18) {
+          expectedVerse = '19-20';
+        } else if (v > 18) {
+          expectedVerse = `${v+2}`;
+        }
+
+        expect(verseData.contextId.reference.bookId).toBe('1jn');
+        expect(verseData.contextId.reference.chapter).toBe(testChapter);
+        expect(verseData.contextId.reference.verse).toBe(expectedVerse);
+        expect(verseData.contextId.tool).toBe('wordAlignment');
+        expect(verseData.contextId.groupId).toBe(`chapter_${testChapter}`);
+      }
+    });
   });
 
   describe('getLatestVersionInPath() tests', () => {

src/__tests__/fixtures/project/en_ust_1jn/1jn/1.json

@@ -0,0 +1,13 @@
+{
+  "1": "{I, John, am writing to you} about {Jesus,} the Word {of God}, the one who gives life. He existed before there was anything else. We {apostles} listened to him {as he taught people}. We saw him personally. We looked at him and touched him. {So we can testify that he was a real human being.}",
+  "2": "Because he came here to the earth and we saw him, we are proclaiming him to you clearly. The one who has always existed, who had been with his Father in heaven, came here to us.\n\n\\ts\\*",
+  "3": "We want you to share life with us, and so we are proclaiming to you what we saw {Jesus do} and what we heard {Jesus say}. {If you believe in him,} you will share life, as we do, with God our Father and with his Son Jesus the Messiah.",
+  "4": "I am writing to you about these things so that {you will recognize that they are true, and that as a result} we will be completely joyful together.\n\n\\ts\\*\n\\p",
+  "5": "The message that we heard from Jesus and are proclaiming to you is this: God always does what is right, and he never, ever does anything wrong. He is like a pure light in which there is no darkness at all.",
+  "6": "If we say that we share life with God, but we live in an evil manner, we are lying. We are not living truthfully. It is as though we are living in the dark.",
+  "7": "But if we live in a pure manner, as God is pure in every way, then we can share life with each other. This is like living in God’s pure light. Then God forgives all of our sin and accepts us because his Son Jesus died for us.\n\n\\ts\\*",
+  "8": "If we say that we do not commit sin, we are fooling ourselves. We are refusing to believe the true things {that God says about us}.",
+  "9": "But God always does what he says he will do, and what he does is always right. So if we admit to him that we have sinned {and reject that sin}, he will forgive us for our sins and he will free us from {the guilt of} everything that we have done wrong.",
+  "10": "{Because God says that everyone has sinned,} if we say that we have not sinned, we are speaking as if God were a liar! We are rejecting what God has said about us!\n\n\\ts\\*",
+  "front": "\\p"
+}

src/__tests__/fixtures/project/en_ust_1jn/1jn/2.json

@@ -0,0 +1,32 @@
+{
+  "1": "You are as dear to me as though you were my own children. Therefore, I am writing this to you to keep you from sinning. But if any of you does sin, {remember that} Jesus the Messiah, the righteous one, pleads with the Father {and asks him to forgive us}.",
+  "2": "Jesus is the one who sacrificed his life for us so that God could forgive our sins. And this is true not just of our sins, but of all the sins that all people everywhere have committed!\n\\p",
+  "3": "When we obey what God commands us to do, then we can be sure that we have come to have a close relationship with God.\n\n\\ts\\*",
+  "4": "If someone says, “I am living in close relationship with God,” but that person does not obey what God has commanded, then he is a liar. He is not conducting his life according to God’s true message.",
+  "5": "But if someone obeys what God has commanded, that person loves God in every way. This is how we can be sure that we have a close relationship with God:",
+  "6": "If anyone says that he has a close relationship with God, then he should conduct his life as Jesus did {when he was here on earth}.\n\n\\ts\\*\n\\p",
+  "7": "Dear friends, I am not writing this to tell you to do something new. Instead, I am writing this to tell you to do something that you have known that you should do since you first believed {in Jesus}. This is {part of} the message that {Jesus gave to us and that} we have already told to you.",
+  "8": "However, if we think about this in another way, I am telling you to do something new. It is new because the way that the Messiah lived was new, and the way that you are living is new. That is because you are ceasing to do evil and you are doing good more and more. It is as though you have come out of a dark place and have begun to live in light from God.\n\n\\ts\\*",
+  "9": "Someone might say that he is living in a good way, just as God wants him to do. That would be like living in light from God. But if he hates any of his fellow believers, then he is still living in a bad way, doing what God does not want, like a person who lives in darkness.",
+  "10": "But if someone loves his fellow believers, then he is truly living well, like a person who is living in light from God. He will not have a reason to do anything evil {as he would have if he hated a fellow believer}. This is like a person in daylight who has no reason to trip over anything.",
+  "11": "But anyone who hates a fellow believer is living in a completely wrong way. He does not understand how he should live, because the wrong things that he is doing are keeping him from understanding God’s way. It is as though he is walking in darkness, and cannot see where to go.\n\n\\ts\\*\n\\p",
+  "12": "I am writing to you, whom I love as though you were my own children, because God has forgiven your sins because of what Jesus has done for you.",
+  "13": "I am writing to you who have been believers longer than the others. I am writing to you because you have a close relationship with {Jesus,} the person who has always been alive. I am writing to you newer but steadfast believers because Satan, that evil being, has tried to tempt you to do wrong, but you have successfully resisted him.",
+  "14": "I have written to you whom I love as though you were my own little children because you have a close relationship with God the Father. I have written to you who have been believers longer than the others because you have a close relationship with {Jesus,} the person who has always been alive. I have written to you newer but steadfast believers because you are spiritually strong. I have also written to you because you continue to obey what God commands, and because you have successfully resisted {Satan,} that evil being{,} when he tried to tempt you to do wrong.\n\n\\ts\\*\n\\p",
+  "15": "Do not desire to be like people who do not honor God. Do not desire the things that they want to have. If anyone desires to be like those people, {he is proving that} he does not love God the Father.",
+  "16": "{I say that such a person does not love God the Father} because the way that ungodly people live is not the way that God our Father teaches us to live. They want to fulfill their physical desires. They want to get for themselves the things that they see. They boast about all of the things that they own. All of these things come from the selfish and ungodly way of thinking.",
+  "17": "The people who do not honor God will disappear, along with all of the things that they desire. But the people who do what God wants them to do will live forever!\n\n\\ts\\*\n\\p",
+  "18": "You who are as dear to me as though you were my own children, {I want you to know that} this is the time just before Jesus returns to earth. You have already heard that a person is coming who will strongly oppose the Messiah. In fact, many people like that, who are against the true Messiah, are already here. Because of this, we know that it is that time.",
+  "19": "These people refused to remain in our congregations. However, they never really belonged with us in the first place. After all, if they had belonged with us, they would not have left us. But {when they left us,} then we clearly saw that none of them had actually joined with us.\n\n\\ts\\*",
+  "20": "But as for you, the Holy Messiah has given you his Spirit. As a result, you all know {what is true}.",
+  "21": "I am not writing this letter to you because you do not know the true things {that God has told us}, but because you do know them. You also know enough to recognize and reject every lie that is not one of the true things {that God has told us}.\n\n\\ts\\*",
+  "22": "The worst liars are the ones who deny that Jesus is the Messiah. All who do that are against the Messiah. They are refusing to believe both in God the Father and in Jesus his Son.",
+  "23": "Those who refuse to acknowledge that Jesus is God’s Son are in no way joined with God the Father. But those who acknowledge that Jesus is God’s Son are also joined with God the Father.\n\n\\ts\\*",
+  "24": "Here is what you must do{, unlike those people who deny Jesus}. You must continue to believe and live by the truth about Jesus the Messiah that you first heard. If you continue to believe and live by the truth about Jesus the Messiah that you first heard, then you will continue to share life with Jesus the Son and God the Father.",
+  "25": "And what God promised us is that he will enable us to live forever!\n\\p",
+  "26": "I am writing this letter to you to warn you about people who want to deceive you {about Jesus}.\n\n\\ts\\*",
+  "27": "Here is what you should do {about those people who are trying to deceive you}. God’s Spirit, whom you received from Jesus, continues to live in you. So you do not need anyone else to be your teacher. God’s Spirit is teaching you everything that you need to know. He always teaches the truth, and never says anything that is false. So continue to live in the way that he has taught you, and continue to share life with Jesus.\n\\p",
+  "28": "Now, my dear ones, {I urge you to} continue to share life with Jesus. That way, when he comes back again, we will be confident {that he will accept us}. {If we do that,} we will not be ashamed to stand before him when he returns.",
+  "29": "Since you know that God always does what is right, you know that all those who continue doing what is right are the ones who have become God’s spiritual children.\n\n\\ts\\*",
+  "front": "\\p"
+}

src/__tests__/fixtures/project/en_ust_1jn/1jn/3.json

@@ -0,0 +1,26 @@
+{
+  "1": "Think about how much God our Father loves us! He says that we are his children. In a spiritual sense, this is completely true. That is why people who are unbelievers do not understand us. It is because they have not understood who God is{, and we take after him just as children take after their parents}.",
+  "2": "Dear friends, at present we are God’s spiritual children. He has not yet shown us what we will be {in the future}. {However,} we know that when Jesus comes back again, we will become like him, because we will see him as he truly is.",
+  "3": "So all those who confidently expect to see Jesus as he truly is make themselves free from sin because Jesus himself is free from sin.\n\n\\ts\\*",
+  "4": "But everyone who continues to sin is refusing to obey God’s laws, because that is what sin is, refusing to obey God’s laws.",
+  "5": "You know that Jesus came in order to make us free from our sins. {You know} also {that} he never sinned himself.",
+  "6": "Those who share life with Jesus do not continue sinning. But all those who continue to sin have not understood who Jesus is and they do not really know him.\n\n\\ts\\*",
+  "7": "So I urge you who are very dear to me not to let anyone deceive you {by telling you that it is all right to sin}. If you continue doing what is right, that will please God, just as Jesus always does what pleases God.",
+  "8": "But anyone who continues to sin is behaving like the devil, because the devil has always been sinning, ever since the world began. The very reason that God’s Son became a human being was to undo this work of the devil {that kept people continually sinning}.\n\n\\ts\\*",
+  "9": "People do not continue sinning if they have become spiritual children of God because God has made them to be like him. They cannot continually sin, because they are God’s spiritual children.",
+  "10": "People who belong to God are clearly different from people who belong to the devil. Those who do not do what is right do not belong to God. Those who do not love their fellow believers also do not belong to God.\n\n\\ts\\*\n\\p",
+  "11": "{You should recognize this because} the message that you heard when you first believed in Jesus is that we should love each other.",
+  "12": "We should not hate others as {Adam’s son} Cain did. He belonged to {Satan,} that evil being. Cain murdered his {younger} brother {Abel}. I will tell you why he did that. It was because Cain behaved in an evil way, and {he hated his younger brother because} his younger brother behaved in the right way.\n\n\\ts\\*",
+  "13": "Therefore, my fellow believers, you should not be amazed when unbelievers hate you.",
+  "14": "We love our fellow believers, and this assures us that God has made us spiritually alive. But if someone does not love {other believers}, then that person is still spiritually dead.",
+  "15": "Anyone who hates one of his fellow believers is doing something just as bad as murdering him. And you know that someone who murders another person is not living in the new way that God enables us to live.\n\n\\ts\\*",
+  "16": "Jesus taught us how to truly love each other when he willingly died for us. For our part, we should also be willing to do anything for our fellow believers, even die for them.",
+  "17": "Many of us have the things that are necessary for life in this world. But supppose that we become aware that a fellow believer does not have what he needs. Suppose also that we refuse to provide for him. Then we are not loving him the way that God taught us to love {people}.",
+  "18": "You who are as dear to me as though you were my own children, let us not {merely} say that we love {each other}. Let us love {each other} genuinely by helping {each other}.\n\n\\ts\\*\n\\p",
+  "21": "Dear friends, when we feel that God does not condemn us {for having sinned}, then we can pray confidently to God.",
+  "22": "We find that when we pray confidently to God and ask for something, he gives it to us. {We pray confidently like this} because {as people who belong to him,} we do what he commands us to do and we do what pleases him.\n\n\\ts\\*",
+  "23": "I will tell you what God commands us to do. We must trust in his Son, Jesus the Messiah. We must also love each other just as Jesus commanded us to do.",
+  "24": "The people who do what God commands share life with God, and God shares life with them. I will tell you how we can be sure that God is sharing life with us. We can be sure of that because we have God’s Spirit, whom he gave to us.\n\n\\ts\\*",
+  "front": "\\p",
+  "19-20": "By doing that, we can know that we belong to God, who is the source of everything that is true. When we are in God’s presence we may feel that we do not belong to God because of our sins. When that happens, we can reassure ourselves that we truly do belong to him. This is because God is more trustworthy than our feelings and he knows everything about us{, including that we have trusted in him}."
+}