Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update production to v1.15 #1616

Merged
merged 5 commits into from
Oct 12, 2023
Merged

Update production to v1.15 #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f5d166
solved issue 1600 & 174 (#1611)
Joel-C-Johnson Aug 28, 2023
58d9896
solved the issuses 1606, 1607 and 1395
Joel-C-Johnson Oct 6, 2023
77827b5
added latest version of RCL
Joel-C-Johnson Oct 10, 2023
fe10e2d
Merge pull request #1614 from unfoldingWord/bugFix-Joel-1606-1607-1395
Joel-C-Johnson Oct 10, 2023
99afb1d
Merge pull request #1615 from unfoldingWord/updateStage-1.15
Joel-C-Johnson Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tc-create-app",
"homepage": "https://create.translationcore.com/",
"version": "1.14",
"version": "1.15",
"license": "MIT",
"private": false,
"bugs": {
Expand Down Expand Up @@ -35,7 +35,7 @@
"@material-ui/styles": "^4.11.3",
"axios": "^0.21.0",
"bible-reference-range": "^1.1.0",
"datatable-translatable": "^1.2.1",
"datatable-translatable": "1.2.2",
"dcs-branch-merger": "^1.3.0",
"deep-freeze": "^0.0.1",
"gitea-react-toolkit": "2.2.4",
Expand All @@ -48,7 +48,7 @@
"react-icons": "^4.8.0",
"react-select": "^4.1.0",
"react-waypoint": "^10.1.0",
"scripture-resources-rcl": "^5.5.3",
"scripture-resources-rcl": "5.5.5",
"tc-ui-toolkit": "^5.3.3",
"use-deep-compare": "^1.1.0",
"use-deep-compare-effect": "^1.3.1",
Expand Down
2 changes: 1 addition & 1 deletion public/build_number
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
265-99f3c5d
268-58d9896
2 changes: 2 additions & 0 deletions src/components/translatable/TranslatableTSV.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
defaultResourceLinks,
stripDefaultsFromResourceLinks,
generateAllResourceLinks,
ORIGINAL_LANG_POSITION,
} from '../../core/resourceLinks';
import { SERVER_URL } from '../../core/state.defaults';

Expand Down Expand Up @@ -180,6 +181,7 @@ export default function TranslatableTSV({
resources={resources}
onResources={setResources}
config={serverConfig}
ORIGINAL_LANG_POSITION={ORIGINAL_LANG_POSITION}
>
<DataTable
sourceFile={sourceContent || releasedSourceContent}
Expand Down
17 changes: 12 additions & 5 deletions src/core/resourceLinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,33 @@ const enUltResourceLink = 'unfoldingWord/en/ult/master';
const enUstResourceLink = 'unfoldingWord/en/ust/master';

export const defaultResourceLinks = [
hebrewResourceLink,
greekResourceLink,
enUltResourceLink,
enUstResourceLink,
hebrewResourceLink,
greekResourceLink,
];

// for changing the postion of resource in scripture RCL
// to display the orginal language to first ORIGINAL_LANG_POSITION to first = 1 also read line no 32
// default orignal language will be displayed last

export const ORIGINAL_LANG_POSITION = 0

export const generateAllResourceLinks = ({ bookId, resourceLinks = [] }) => {
const reference = { bookId };
const _testament = testament(reference);
let originalLink =
_testament === 'old' ? hebrewResourceLink : greekResourceLink;

_testament === 'old' ? hebrewResourceLink : greekResourceLink;
const _resourceLinks = resourceLinks || [];

// need to add reference bookId to resource links
// To change the position of scripture resource in the panel, move the elements in different index in allResourceLinks
// eg move "originalLink" to the last index to move hebrew / greek to last
const allResourceLinks = [
originalLink,
enUltResourceLink,
enUstResourceLink,
..._resourceLinks,
originalLink,
];

// Add bookId to all resource paths:
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.1.tgz#665c81f912542e710259a0e96803cee34f7d351d"
integrity sha512-WVA90z9sNVXcSjWR15Mdoo7quy/m4+wjaB2Zec+rZozcSJy9dWr4rJs6lCrPh7NjHknpRJ4Tx49atzGlvyZ/GA==
datatable-translatable@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.2.tgz#cb12c862db592219c3450c2f97d59f76797fb8fe"
integrity sha512-TH/Ribv+P4Qs+3VhMcZYBHZgpRAfJGX++E3GYckJRyjZU4C6WWU/SmzvNdThXwkVXAFJvBP32yHPJ/ZLS2/Kaw==
dependencies:
deep-freeze "^0.0.1"
extensible-rcl "^1.1.0"
Expand Down Expand Up @@ -15426,10 +15426,10 @@ schema-utils@^3.0.0:
ajv "^6.12.5"
ajv-keywords "^3.5.2"

scripture-resources-rcl@^5.5.3:
version "5.5.3"
resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.3.tgz#7782d2eafd8679a5c23b1d084184196f3e86910a"
integrity sha512-8eBoYzOCvm6cDrECDfyiYlaLCcO83BbSoL4ndIPhnOr6BGXYHsynfc5ZAG2/jwbuU4Ul1WJXuxkSiz0NwjfbRQ==
scripture-resources-rcl@5.5.5:
version "5.5.5"
resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.5.tgz#6fd6d05614be05b053abaf98236e9d701ae18299"
integrity sha512-GE22R5/PVai4xHPMvH6ITpXbIdGLTpXIk7BJODzLjkdxxZjKASyunynCsIWR8bg6oSdPL1i5zR1pdw1Zx9Vm0A==
dependencies:
bible-reference-range "^1.1.0"
deep-freeze "^0.0.1"
Expand Down