From 9b89c5c80566df9fc93b4cbb4d3c2cb1b5d9eb47 Mon Sep 17 00:00:00 2001 From: Noah Harvey Date: Wed, 22 Nov 2023 17:20:03 -0500 Subject: [PATCH 1/7] updates dcs-branch-merger to 1.4.1 --- package.json | 2 +- public/build_number | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index bc057382..6c99b673 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "axios": "^0.21.0", "bible-reference-range": "^1.1.0", "datatable-translatable": "1.2.3", - "dcs-branch-merger": "^1.3.0", + "dcs-branch-merger": "1.4.1", "deep-freeze": "^0.0.1", "gitea-react-toolkit": "2.2.4", "lodash.isequal": "^4.5.0", diff --git a/public/build_number b/public/build_number index 79ca276e..3d6b7630 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -273-2ccee8b +274-ac6d090 diff --git a/yarn.lock b/yarn.lock index 187dc870..f14b3b8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5749,10 +5749,10 @@ dayjs@^1.9.3: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== -dcs-branch-merger@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/dcs-branch-merger/-/dcs-branch-merger-1.3.0.tgz#0836fa5c6cd37d28fccc8b7fc9569b1ef3eae393" - integrity sha512-MZ8skMj7J96PQiYwu/ILTSE5gItpFvKNFshc/aekkEAMzXeo+ZDbO0v3g05CVQGXLHQ5vQ09igAUIXz36LzsZw== +dcs-branch-merger@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/dcs-branch-merger/-/dcs-branch-merger-1.4.1.tgz#57a2819c8189f8f23325eff8bebf4f7c698b2c49" + integrity sha512-IJbG5OpZQkxNDYao+T5MOrtVatvzDBGsuEwoZ7kq214OCTwlR+J96ApyamNeg+/i5ZQ8oKa3H4OMM6NFp6s7Zw== dependencies: path "0.12.7" From 98b50915566ee2b6270296a5dca10e822026e16c Mon Sep 17 00:00:00 2001 From: Noah Harvey Date: Wed, 22 Nov 2023 17:20:19 -0500 Subject: [PATCH 2/7] bumps package version --- package.json | 2 +- public/build_number | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6c99b673..7e9abdc7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tc-create-app", "homepage": "https://create.translationcore.com/", - "version": "1.16", + "version": "1.17", "license": "MIT", "private": false, "bugs": { diff --git a/public/build_number b/public/build_number index 3d6b7630..9935315f 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -274-ac6d090 +275-9b89c5c From c25d2698ef364917f674979217a104303493c056 Mon Sep 17 00:00:00 2001 From: Joel C Johnson Date: Thu, 23 Nov 2023 18:30:59 +0530 Subject: [PATCH 3/7] fixed issue #1631 --- public/build_number | 2 +- src/components/translatable/Translatable.js | 12 +++--------- src/components/translatable/TranslatableTSV.js | 10 ++++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/public/build_number b/public/build_number index 79ca276e..3d6b7630 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -273-2ccee8b +274-ac6d090 diff --git a/src/components/translatable/Translatable.js b/src/components/translatable/Translatable.js index 1deb4359..cb8f6464 100644 --- a/src/components/translatable/Translatable.js +++ b/src/components/translatable/Translatable.js @@ -55,32 +55,25 @@ function Translatable() { {' '} ); - // console.log("filepathsMatch=", filepathsMatch) - // console.log("sourceFileContent", sourceFileContent) - // console.log("releasedSourceContent", releasedSourceContent) - // console.log("targetFileContent", targetFileContent) if ( filepathsMatch && (sourceFileContent || releasedSourceContent) && targetFileContent ) { + const organizationName = targetRepository?.full_name.split('/')[0]?.toLowerCase(); if (filepath.match(/\.md$/)) { let translatableProps = { - original: sourceFileContent ? sourceFileContent : releasedSourceContent, + original: organizationName === "unfoldingword" ? sourceFileContent:releasedSourceContent, translation: targetFileContent, onTranslation: saveTranslation, onContentIsDirty: setContentIsDirty, translationFontFamily: selectedFont, }; - console.log('Markdown file selected'); _translatable = ; } else if (filepath.match(/\.tsv$/)) { - console.log('TSV file selected'); const onSave = async function (...args) { - console.log("branch-merger: started saving"); const saved = await saveTranslation(...args); - console.log("branch-merger: finished saving"); return saved; } const onEdit = function (...args) { @@ -106,6 +99,7 @@ function Translatable() { saveTranslation, autoSaveOnEdit, selectedFont, + targetRepository.full_name ]); useEffect(() => { diff --git a/src/components/translatable/TranslatableTSV.js b/src/components/translatable/TranslatableTSV.js index 570e3bca..804df879 100644 --- a/src/components/translatable/TranslatableTSV.js +++ b/src/components/translatable/TranslatableTSV.js @@ -58,6 +58,7 @@ export default function TranslatableTSV({ expandedScripture, cachedFile, selectedFont, + targetRepository, }, actions: { setResourceLinks }, giteaReactToolkit: { @@ -66,6 +67,8 @@ export default function TranslatableTSV({ }, } = useContext(AppContext); + const organizationName = targetRepository?.full_name.split('/')[0]?.toLowerCase(); + const { filepath: sourceFilepath, content: sourceContent, @@ -73,12 +76,11 @@ export default function TranslatableTSV({ } = sourceFileHook.state || {}; const { content: targetContent } = targetFileHook.state || {}; const { content: cachedContent } = cachedFile || {}; - // console.log("TranslatableTSV() sourceContent, publishedContent:", sourceContent, releasedSourceContent) const columnNames = useMemo(() => { - const _content = sourceContent || releasedSourceContent; + const _content = organizationName === "unfoldingword" ? sourceContent : releasedSourceContent; const _columnNames = columnNamesFromContent({ content: _content, delimiters }); return _columnNames; - }, [sourceContent, releasedSourceContent]); + }, [sourceContent, releasedSourceContent, organizationName ]); const { actions: { onValidate }, @@ -184,7 +186,7 @@ export default function TranslatableTSV({ ORIGINAL_LANG_POSITION={ORIGINAL_LANG_POSITION} > Date: Fri, 1 Dec 2023 13:28:30 +0530 Subject: [PATCH 4/7] updated the package --- package.json | 2 +- public/build_number | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index bc057382..eeb9e108 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@material-ui/styles": "^4.11.3", "axios": "^0.21.0", "bible-reference-range": "^1.1.0", - "datatable-translatable": "1.2.3", + "datatable-translatable": "1.2.4-beta", "dcs-branch-merger": "^1.3.0", "deep-freeze": "^0.0.1", "gitea-react-toolkit": "2.2.4", diff --git a/public/build_number b/public/build_number index 3d6b7630..ebecf6b3 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -274-ac6d090 +275-840d620 diff --git a/yarn.lock b/yarn.lock index 187dc870..06c9ad50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5727,10 +5727,10 @@ data-urls@^1.0.0, data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -datatable-translatable@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.3.tgz#f8d32c1f0da9a2b66662eca2983ea9d88185aca8" - integrity sha512-QT+JAKq5QfA+bGkrwFO5rMoTKaJ34/mGlMzKX3q2ILK7QdWYg5vP2Xq28iroAa5Fpu/Ka8tlCBIlFtYJwtygrA== +datatable-translatable@1.2.4-beta: + version "1.2.4-beta" + resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.4-beta.tgz#95ca4112f094e3bf0a87d4cce0dbc97e79e0f747" + integrity sha512-wJW6GarlkfnfwlcIiAN/DPrZ1uYu4cheiwgrqYIBA5oR9ppWCc1Eji20wGKCYyizohQDzL/zKKjPdkJKQHTXQA== dependencies: deep-freeze "^0.0.1" extensible-rcl "^1.1.0" From 90c96ed6db0837d78f996d0278818143db51b857 Mon Sep 17 00:00:00 2001 From: Joel C Johnson Date: Tue, 5 Dec 2023 12:58:14 +0530 Subject: [PATCH 5/7] updated rcl version to latest --- package.json | 2 +- public/build_number | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index eeb9e108..44f62b86 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@material-ui/styles": "^4.11.3", "axios": "^0.21.0", "bible-reference-range": "^1.1.0", - "datatable-translatable": "1.2.4-beta", + "datatable-translatable": "1.2.4", "dcs-branch-merger": "^1.3.0", "deep-freeze": "^0.0.1", "gitea-react-toolkit": "2.2.4", diff --git a/public/build_number b/public/build_number index ebecf6b3..38ee24eb 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -275-840d620 +276-d97d971 diff --git a/yarn.lock b/yarn.lock index 06c9ad50..23656a50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5727,10 +5727,10 @@ data-urls@^1.0.0, data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -datatable-translatable@1.2.4-beta: - version "1.2.4-beta" - resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.4-beta.tgz#95ca4112f094e3bf0a87d4cce0dbc97e79e0f747" - integrity sha512-wJW6GarlkfnfwlcIiAN/DPrZ1uYu4cheiwgrqYIBA5oR9ppWCc1Eji20wGKCYyizohQDzL/zKKjPdkJKQHTXQA== +datatable-translatable@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.4.tgz#73f17f0ee00bc091f872962766aaadfcc199d8c8" + integrity sha512-P+NZCOjwgBcohVPHm1iQSVUNo5QkA0sdmmW6xPaeo2L9I5AWdE02vRLWEfyfPBlOW7hymGHVqWOi5LGyk+N5PQ== dependencies: deep-freeze "^0.0.1" extensible-rcl "^1.1.0" From 600605309d0c35822b8f662e13b00d6637d3e186 Mon Sep 17 00:00:00 2001 From: Joel C Johnson Date: Tue, 5 Dec 2023 12:59:34 +0530 Subject: [PATCH 6/7] updated tC Create version to 1.17 --- package.json | 2 +- public/build_number | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 44f62b86..2d30b16a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tc-create-app", "homepage": "https://create.translationcore.com/", - "version": "1.16", + "version": "1.17", "license": "MIT", "private": false, "bugs": { diff --git a/public/build_number b/public/build_number index 38ee24eb..5b5a2fbb 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -276-d97d971 +277-90c96ed From 6074ef576928c66208a10f39edfe2c61b0838945 Mon Sep 17 00:00:00 2001 From: "revant.cherian" Date: Wed, 13 Dec 2023 15:41:30 +0530 Subject: [PATCH 7/7] Update datatable-translatable package to 1.2.4 fixes #1632 --- package.json | 2 +- public/build_number | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7e9abdc7..fece301d 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@material-ui/styles": "^4.11.3", "axios": "^0.21.0", "bible-reference-range": "^1.1.0", - "datatable-translatable": "1.2.3", + "datatable-translatable": "1.2.4", "dcs-branch-merger": "1.4.1", "deep-freeze": "^0.0.1", "gitea-react-toolkit": "2.2.4", diff --git a/public/build_number b/public/build_number index 1dc7f310..601ad778 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -277-90c96ed \ No newline at end of file +278-e8671df