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

SF-3155 Fix incorrect draft source language codes #2963

Merged
merged 1 commit into from
Jan 27, 2025
Merged

SF-3155 Fix incorrect draft source language codes #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/SIL.XForge.Scripture/Services/MachineProjectService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,30 +446,30 @@ await projectDoc.SubmitJson0OpAsync(op =>
// If there is an alternate training source, ensure that name, writing system and RTL is correct
if (projectDoc.Data.TranslateConfig.DraftConfig.AlternateTrainingSource is not null)
{
ParatextSettings? alternateSourceSettings = paratextService.GetParatextSettings(
ParatextSettings? alternateTrainingSourceSettings = paratextService.GetParatextSettings(
userSecret,
projectDoc.Data.TranslateConfig.DraftConfig.AlternateTrainingSource.ParatextId
);
if (alternateSourceSettings is not null)
if (alternateTrainingSourceSettings is not null)
{
await projectDoc.SubmitJson0OpAsync(op =>
{
op.Set(
pd => pd.TranslateConfig.DraftConfig.AlternateTrainingSource.IsRightToLeft,
alternateSourceSettings.IsRightToLeft
alternateTrainingSourceSettings.IsRightToLeft
);
if (alternateSourceSettings.LanguageTag is not null)
if (alternateTrainingSourceSettings.LanguageTag is not null)
{
op.Set(
pd => pd.TranslateConfig.DraftConfig.AlternateTrainingSource.WritingSystem.Tag,
alternateSourceSettings.LanguageTag
alternateTrainingSourceSettings.LanguageTag
);
}
if (alternateSourceSettings.FullName is not null)
if (alternateTrainingSourceSettings.FullName is not null)
{
op.Set(
pd => pd.TranslateConfig.DraftConfig.AlternateTrainingSource.Name,
alternateSourceSettings.FullName
alternateTrainingSourceSettings.FullName
);
}
});
Expand Down
4 changes: 2 additions & 2 deletions src/SIL.XForge.Scripture/Services/ParatextService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ string contextInformation
}

// Get the writing system details
WritingSystem writingSystem = GetWritingSystem(scrText.Language.Id);
WritingSystem writingSystem = GetWritingSystem(scrText.Settings.LanguageID.Id);
return new ParatextSettings
{
FullName = scrText.FullName,
Expand Down Expand Up @@ -1848,7 +1848,7 @@ public bool LocalProjectDirExists(string paratextId)
public WritingSystem GetWritingSystem(UserSecret userSecret, string ptProjectId)
{
using ScrText scrText = GetScrText(userSecret, ptProjectId);
return GetWritingSystem(scrText.Language.Id);
return GetWritingSystem(scrText.Settings.LanguageID.Id);
}

public void ClearParatextDataCaches(UserSecret userSecret, string paratextId)
Expand Down
4 changes: 4 additions & 0 deletions src/SIL.XForge.Scripture/Services/ParatextSyncRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,6 +1831,10 @@ await _projectDoc.SubmitJson0OpAsync(op =>
if (sourceSettings != null)
{
op.Set(pd => pd.TranslateConfig.Source.IsRightToLeft, sourceSettings.IsRightToLeft);
if (sourceSettings.LanguageRegion != null)
op.Set(pd => pd.WritingSystem.Region, sourceSettings.LanguageRegion);
if (sourceSettings.LanguageScript != null)
op.Set(pd => pd.WritingSystem.Script, sourceSettings.LanguageScript);
if (sourceSettings.LanguageTag != null)
op.Set(pd => pd.TranslateConfig.Source.WritingSystem.Tag, sourceSettings.LanguageTag);
}
Expand Down
Loading