SF-3187 Store the correct language code when migrating resources

sillsdev · Feb 3, 2025 · e4e0f65 · e4e0f65
1 parent c463df6
commit e4e0f65
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/SIL.XForge.Scripture/Services/ParatextService.cs b/src/SIL.XForge.Scripture/Services/ParatextService.cs
@@ -2536,6 +2536,9 @@ private void MigrateResourceIfRequired(string username, string paratextId, Langu
         if (overrideLanguage is not null)
         {
             scrText.Settings.LanguageID = overrideLanguage;
+
+            // This will create Settings.xml with the correct LanguageIsoCode value
+            scrText.Settings.Save();
         }
 
         // Perform a simple migration of the Paratext 7 LDML file to the new Paratext 8+ location.

diff --git a/test/SIL.XForge.Scripture.Tests/Services/ParatextServiceTests.cs b/test/SIL.XForge.Scripture.Tests/Services/ParatextServiceTests.cs
@@ -4285,6 +4285,15 @@ public async Task SendReceiveAsync_SourceResource_DblLanguageDifferent()
         env.MockScrTextCollection.FindById(Arg.Any<string>(), resourceId).Returns(scrText);
         ScrTextCollection.Initialize("/srv/scriptureforge/projects");
 
+        // The FileManager will be disposed via the using statement in ParatextService.MigrateResourceIfRequired(),
+        // so capture the saving of the settings here
+        bool settingsSaved = false;
+        scrText
+            .FileManager.When(fm =>
+                fm.WriteFileCreatingBackup("Settings.xml", Arg.Any<Action<string>>(), Arg.Any<Action<string>>())
+            )
+            .Do(_ => settingsSaved = true);
+
         // Set up the mock file system calls used by the migration
         env.MockFileSystemService.FileExists(Arg.Is<string>(p => p.EndsWith("ldml.xml"))).Returns(true);
         env.MockFileSystemService.FileExists(Arg.Is<string>(p => p.EndsWith(".ldml"))).Returns(false);
@@ -4305,6 +4314,7 @@ public async Task SendReceiveAsync_SourceResource_DblLanguageDifferent()
         env.MockFileSystemService.Received(1)
             .MoveFile(Arg.Is<string>(p => p.EndsWith("ldml.xml")), Arg.Is<string>(p => p.EndsWith(".ldml")));
         Assert.AreEqual(scrText.Settings.LanguageID.Code, zipLanguageCode);
+        Assert.IsTrue(settingsSaved);
     }
 
     [Test]
@@ -4338,6 +4348,15 @@ public async Task SendReceiveAsync_SourceResource_DblLanguageMissing()
         env.MockScrTextCollection.FindById(Arg.Any<string>(), resourceId).Returns(scrText);
         ScrTextCollection.Initialize("/srv/scriptureforge/projects");
 
+        // The FileManager will be disposed via the using statement in ParatextService.MigrateResourceIfRequired(),
+        // so capture the saving of the settings here
+        bool settingsSaved = false;
+        scrText
+            .FileManager.When(fm =>
+                fm.WriteFileCreatingBackup("Settings.xml", Arg.Any<Action<string>>(), Arg.Any<Action<string>>())
+            )
+            .Do(_ => settingsSaved = true);
+
         // Set up the mock file system calls used by the migration
         env.MockFileSystemService.FileExists(Arg.Is<string>(p => p.EndsWith("ldml.xml"))).Returns(true);
         env.MockFileSystemService.FileExists(Arg.Is<string>(p => p.EndsWith(".ldml"))).Returns(false);
@@ -4355,6 +4374,7 @@ public async Task SendReceiveAsync_SourceResource_DblLanguageMissing()
         env.MockFileSystemService.Received(1)
             .MoveFile(Arg.Is<string>(p => p.EndsWith("ldml.xml")), Arg.Is<string>(p => p.EndsWith(".ldml")));
         Assert.AreEqual(resourceScrText.Settings.LanguageID?.Code, "en");
+        Assert.IsTrue(settingsSaved);
     }
 
     [Test]