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.

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

Fixes missed from previous PR #367

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Fixes missed from previous PR #367

merged 2 commits into from
Apr 17, 2024

Conversation

johnml1135
Copy link
Collaborator

@johnml1135 johnml1135 commented Apr 16, 2024

I believe these are the fixes that didn't make it in (and were stored in the stash).


This change is Reviewable

@johnml1135 johnml1135 requested a review from ddaspit April 16, 2024 20:28
Copy link
Contributor

@ddaspit ddaspit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @johnml1135)


src/Serval.Translation/Services/PretranslationService.cs line 73 at r1 (raw file):

        string? usfm = await _scriptureDataFileService.ReadParatextProjectBookAsync(targetFile.Filename, textId);
        if (usfm is not null)
            return UpdateUsfm(targetSettings, usfm, pretranslations);

We should use relaxed comparison when updating the target book.


src/Serval.Translation/Services/PretranslationService.cs line 78 at r1 (raw file):

        usfm = await _scriptureDataFileService.ReadParatextProjectBookAsync(sourceFile.Filename, textId);
        if (usfm is not null)
            return UpdateUsfm(sourceSettings, usfm, pretranslations, targetSettings.FullName, stripAllText: true);

We should use strict comparison when copying the source book.

@johnml1135
Copy link
Collaborator Author

src/Serval.Translation/Services/PretranslationService.cs line 73 at r1 (raw file):

Previously, ddaspit (Damien Daspit) wrote…

We should use relaxed comparison when updating the target book.

done

@johnml1135
Copy link
Collaborator Author

src/Serval.Translation/Services/PretranslationService.cs line 78 at r1 (raw file):

Previously, ddaspit (Damien Daspit) wrote…

We should use strict comparison when copying the source book.

done

Copy link
Contributor

@ddaspit ddaspit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @johnml1135)

@johnml1135 johnml1135 merged commit 7828e26 into main Apr 17, 2024
2 checks passed
@johnml1135 johnml1135 deleted the fix_transactions branch April 17, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants