Improve error handling

sillsdev · Jul 30, 2024 · fcc9ec0 · fcc9ec0
1 parent f4c4ed7
commit fcc9ec0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/SIL.LCModel/Application/ApplicationServices/AppStrings.Designer.cs b/src/SIL.LCModel/Application/ApplicationServices/AppStrings.Designer.cs
diff --git a/src/SIL.LCModel/Application/ApplicationServices/AppStrings.resx b/src/SIL.LCModel/Application/ApplicationServices/AppStrings.resx
@@ -319,9 +319,9 @@
     <comment>Shown during import. The current entry is supposed to be shown as a subentry under "{1}".</comment>
   </data>
   <data name="ksWrongVernWs" xml:space="preserve">
-    <value>Warning: {0} has the wrong default vernacular writing system (expecting {1}, was {2}).</value>
+    <value>Error: {0} has the wrong default vernacular writing system (expecting {1}, was {2}).  Import aborted.</value>
   </data>
   <data name="ksWrongVersion" xml:space="preserve">
-    <value>Warning: {0} has an invalid version number (expecting {1}, was {2}).</value>
+    <value>Error: {0} has an invalid version number (expecting {1}, was {2}).  Import aborted.</value>
   </data>
 </root>
diff --git a/src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs b/src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs
@@ -291,15 +291,13 @@ public void ImportData(TextReader rdr, TextWriter wrtrLog, IProgress progress)
 					if (versionId != null && versionId != PhonologyServices.VersionId)
 					{
 						string sMsg = String.Format(AppStrings.ksWrongVersion, m_sFilename, PhonologyServices.VersionId, versionId);
-						LogMessage(sMsg, LineNumber(xrdr));
 						throw new Exception(sMsg);
 					}
 					string vernWs = xrdr.GetAttribute("DefaultVernWs");
 					string cacheVernWs = m_cache.ServiceLocator.WritingSystems.DefaultVernacularWritingSystem.IcuLocale;
 					if (vernWs != null && vernWs != cacheVernWs)
 					{
 						string sMsg = String.Format(AppStrings.ksWrongVernWs, m_sFilename, cacheVernWs, vernWs);
-						LogMessage(sMsg, LineNumber(xrdr));
 						throw new Exception(sMsg);
 					}
 					xrdr.Read();