From d17093f0b880f1a13fdbf8cd787dd3c711b3ea6d Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Fri, 3 Nov 2023 16:45:18 -0400 Subject: [PATCH 1/2] Fix typos in SIL.DictionaryServices/Lift/ --- SIL.DictionaryServices/Lift/HtmlArticleMaker.cs | 10 +++++----- SIL.DictionaryServices/Lift/LiftWriter.cs | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SIL.DictionaryServices/Lift/HtmlArticleMaker.cs b/SIL.DictionaryServices/Lift/HtmlArticleMaker.cs index d22f7ac28..96f5717b4 100644 --- a/SIL.DictionaryServices/Lift/HtmlArticleMaker.cs +++ b/SIL.DictionaryServices/Lift/HtmlArticleMaker.cs @@ -16,7 +16,7 @@ namespace Palaso.DictionaryServices.Lift public class HtmlArticleMaker { private readonly XslCompiledTransform _transformer; - private readonly XsltArgumentList _tranformArguments; + private readonly XsltArgumentList _transformArguments; public HtmlArticleMaker(string pathToWritingSystemPrefs, string pathToPartsOfSpeech) { @@ -33,11 +33,11 @@ public HtmlArticleMaker(string pathToWritingSystemPrefs, string pathToPartsOfSpe stream.Close(); } - _tranformArguments = new XsltArgumentList(); - _tranformArguments.AddParam("writing-system-info-file", + _transformArguments = new XsltArgumentList(); + _transformArguments.AddParam("writing-system-info-file", string.Empty, pathToWritingSystemPrefs); - _tranformArguments.AddParam("grammatical-info-optionslist-file", + _transformArguments.AddParam("grammatical-info-optionslist-file", string.Empty, pathToPartsOfSpeech); } @@ -58,7 +58,7 @@ public string GetHtmlFragment(string entryXml) StringBuilder builder = new StringBuilder(); using (XmlWriter writer = XmlWriter.Create(builder)) // Don't forget to use CanonicalXmlSettings CP 2011-01 { - _transformer.Transform(reader, _tranformArguments, writer); + _transformer.Transform(reader, _transformArguments, writer); return builder.ToString(); } } diff --git a/SIL.DictionaryServices/Lift/LiftWriter.cs b/SIL.DictionaryServices/Lift/LiftWriter.cs index 210071708..04c6953c7 100644 --- a/SIL.DictionaryServices/Lift/LiftWriter.cs +++ b/SIL.DictionaryServices/Lift/LiftWriter.cs @@ -77,10 +77,10 @@ private void Start() // _writer.WriteAttributeString("xmlns", "flex", null, "http://fieldworks.sil.org"); } - public void WriteHeader(string headerConentsNotIncludingHeaderElement) + public void WriteHeader(string headerContentsNotIncludingHeaderElement) { Writer.WriteStartElement("header"); - Writer.WriteRaw(headerConentsNotIncludingHeaderElement); + Writer.WriteRaw(headerContentsNotIncludingHeaderElement); Writer.WriteEndElement(); } @@ -194,10 +194,10 @@ private void AddEtymology(LexEtymology etymology) // ok if no form is given if (!MultiTextBase.IsEmpty(etymology)) // { Writer.WriteStartElement("etymology"); - //type is required, so add the attribute even if it's emtpy + //type is required, so add the attribute even if it's empty Writer.WriteAttributeString("type", etymology.Type.Trim()); - //source is required, so add the attribute even if it's emtpy + //source is required, so add the attribute even if it's empty Writer.WriteAttributeString("source", etymology.Source.Trim()); AddMultitextGlosses(string.Empty, etymology.Gloss); WriteCustomMultiTextField("comment", etymology.Comment); @@ -244,7 +244,7 @@ public void AddReversal(LexReversal reversal) } /// - /// in the plift subclass, we add a pronounciation if we have an audio writing system alternative on the lexical unit + /// in the plift subclass, we add a pronunciation if we have an audio writing system alternative on the lexical unit /// protected virtual void InsertPronunciationIfNeeded(LexEntry entry, List propertiesAlreadyOutput) { @@ -379,7 +379,7 @@ private void WriteWellKnownCustomMultiText(PalasoDataObject item, } /// - /// this base implementationg is for when we're just exporting to lift, and dont' want to filter or order. + /// this base implementation is for when we're just exporting to lift, and don't want to filter or order. /// It is overridden in a child class for writing presentation-ready lift, when /// we do want to filter and order /// From 7b5e9907a3b9d6f9a18cafad69beeef63d14f665 Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Tue, 14 Nov 2023 13:31:16 -0500 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e4b0347b..59a1fa994 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed +- [SIL.DictionaryServices] Renamed parameter of LiftWriter.WriteHeader from headerConentsNotIncludingHeaderElement to headerContentsNotIncludingHeaderElement - [SIL.WritingSystems] Updated langtags.json and ianaSubtagRegistry.txt - [SIL.Core] Enhanced ErrorReport.GetOperatingSystemLabel method to report Windows 11+ and list the version as well. - [SIL.Core] Enhanced RetryUtility.Retry methods to optionally improve debugging messages, and fixed existing RobustFile and RobustIO methods to use the new optional debugging parameter