diff --git a/src/WinPrint.Console/OutWinPrint.cs b/src/WinPrint.Console/OutWinPrint.cs index de53292..90563f9 100644 --- a/src/WinPrint.Console/OutWinPrint.cs +++ b/src/WinPrint.Console/OutWinPrint.cs @@ -478,7 +478,7 @@ await Task.Run(() => ServiceLocator.Current.UpdateService.GetLatestVersionAsync( return; } - // If Langauge is provided, use it instead of CTE. + // If Language is provided, use it instead of CTE. if (!MyInvocation.BoundParameters.TryGetValue("Language", out var contentType)) { if (!MyInvocation.BoundParameters.TryGetValue("ContentTypeEngine", out contentType)) { // If neither were specified, smartly pick CTE @@ -530,7 +530,7 @@ await Task.Run(() => ServiceLocator.Current.UpdateService.GetLatestVersionAsync( Log.Information("FileName: {FileName}", FileName ?? ""); Log.Information("Title: {title}", Title ?? ""); Log.Information("Content Type: {contentType}", _print.SheetViewModel.ContentType); - Log.Information("Langauge: {langauge}", _print.SheetViewModel.Language); + Log.Information("Language: {Language}", _print.SheetViewModel.Language); Log.Information("Content Type Engine: {cte}", _print.SheetViewModel.ContentEngine.GetType().Name); Log.Information("Printer: {printer}", _print.PrintDocument.PrinterSettings.PrinterName); Log.Information("Paper Size: {size}", _print.PrintDocument.DefaultPageSettings.PaperSize.PaperName); diff --git a/src/WinPrint.Console/WinPrint.Console.csproj b/src/WinPrint.Console/WinPrint.Console.csproj index c451471..5b9e0f8 100644 --- a/src/WinPrint.Console/WinPrint.Console.csproj +++ b/src/WinPrint.Console/WinPrint.Console.csproj @@ -9,7 +9,7 @@ winprint - 2.0.5.100 + 2.0.5.102 Kindel Systems winprint Charlie Kindel diff --git a/src/WinPrint.Core/ContentTypeEngines/ContentTypeEngineBase.cs b/src/WinPrint.Core/ContentTypeEngines/ContentTypeEngineBase.cs index d9c094b..c3d644e 100644 --- a/src/WinPrint.Core/ContentTypeEngines/ContentTypeEngineBase.cs +++ b/src/WinPrint.Core/ContentTypeEngines/ContentTypeEngineBase.cs @@ -135,7 +135,7 @@ public virtual async Task RenderAsync(System.Drawing.Printing.PrinterResolu /// /// /// ContentEngine, ContentType, Language - public static (ContentTypeEngineBase cte, string languageId, string langauge) CreateContentTypeEngine(string contentType) { + public static (ContentTypeEngineBase cte, string languageId, string Language) CreateContentTypeEngine(string contentType) { Debug.Assert(!string.IsNullOrEmpty(contentType)); Debug.Assert(ModelLocator.Current.FileTypeMapping != null); Debug.Assert(ModelLocator.Current.FileTypeMapping.ContentTypes != null); @@ -194,7 +194,7 @@ public static (ContentTypeEngineBase cte, string languageId, string langauge) Cr language = lang.Title; } - // Is it a language name found in a langauge alias? (ansi) + // Is it a language name found in a Language alias? (ansi) lang = ModelLocator.Current.FileTypeMapping.ContentTypes .FirstOrDefault(l => l.Aliases .Where(i => CultureInfo.CurrentCulture.CompareInfo.Compare(i, contentType, CompareOptions.IgnoreCase) == 0).Count() > 0); @@ -295,7 +295,7 @@ public static string GetContentType(string filePath) { // If not text or html, is it a language? //if (!contentType.Equals("text/plain") && !contentType.Equals("text/html")) { // // Technically, because we got the assocation from FilesAssocation, this should always work - // if (!((List)ModelLocator.Current.Associations.Languages).Exists(lang => lang.Id == contentType)) + // if (!((List)ModelLocator.Current.Associations.Languages).Exists(lang => lang.Id == contentType)) // contentType = "text/plain"; //} return contentType; diff --git a/src/WinPrint.Core/Models/Settings.cs b/src/WinPrint.Core/Models/Settings.cs index a8ea438..f1e92dd 100644 --- a/src/WinPrint.Core/Models/Settings.cs +++ b/src/WinPrint.Core/Models/Settings.cs @@ -223,7 +223,7 @@ public static Settings CreateDefaultSettings() { var defaultHFFontSize = 10F; var defaultHFFontStyle = FontStyle.Bold; - var defaultHeaderText = "{DateRevised:D}|{FileName}|Langauge: {Language}"; + var defaultHeaderText = "{DateRevised:D}|{FileName}|Language: {Language}"; var defualtFooterText = "Printed with love by WinPrint||Page {Page} of {NumPages}"; var settings = new Settings { diff --git a/src/WinPrint.Core/Services/FileTypeMappingService.cs b/src/WinPrint.Core/Services/FileTypeMappingService.cs index 7c45c0d..0ae4bcd 100644 --- a/src/WinPrint.Core/Services/FileTypeMappingService.cs +++ b/src/WinPrint.Core/Services/FileTypeMappingService.cs @@ -44,7 +44,7 @@ public FileTypeMapping Load() { // Merge in any language defintions set in settings file var langs = new List(associations.ContentTypes); var langsSettings = new List(ModelLocator.Current.Settings.FileTypeMapping.ContentTypes); - // TODO: overide Equals and GetHashCode for Langauge + // TODO: overide Equals and GetHashCode for Language var result = langsSettings.Union(langs).ToList(); associations.ContentTypes = result; diff --git a/src/WinPrint.Core/ViewModels/SheetViewModel.cs b/src/WinPrint.Core/ViewModels/SheetViewModel.cs index 07d8dd6..7e63fc1 100644 --- a/src/WinPrint.Core/ViewModels/SheetViewModel.cs +++ b/src/WinPrint.Core/ViewModels/SheetViewModel.cs @@ -75,7 +75,7 @@ public string Title { private string _title; /// - /// Content type (e.g. text/x-csharp). Langauge.Id + /// Content type (e.g. text/x-csharp). Language.Id /// public string ContentType { get => _contentType; @@ -84,7 +84,7 @@ public string ContentType { private string _contentType; /// - /// The langauge (Language.Title or Alias) + /// The Language (Language.Title or Alias) /// public string Language { get => _language; diff --git a/src/WinPrint.Core/WinPrint.Core.csproj b/src/WinPrint.Core/WinPrint.Core.csproj index df0b63e..f6d7b12 100644 --- a/src/WinPrint.Core/WinPrint.Core.csproj +++ b/src/WinPrint.Core/WinPrint.Core.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 AnyCPU;x64;x86 - 2.0.5.100 + 2.0.5.102 Kindel Systems winprint Charlie Kindel diff --git a/src/WinPrint.WinForms/WinPrint.WinForms.csproj b/src/WinPrint.WinForms/WinPrint.WinForms.csproj index 50a9f97..39d0fb1 100644 --- a/src/WinPrint.WinForms/WinPrint.WinForms.csproj +++ b/src/WinPrint.WinForms/WinPrint.WinForms.csproj @@ -12,7 +12,7 @@ winprint GUI winprintgui - 2.0.5.100 + 2.0.5.102 Kindel Systems winprint Charlie Kindel diff --git a/tests/WinPrint.Core.UnitTests/Services/FileTypeMappingServiceTests.cs b/tests/WinPrint.Core.UnitTests/Services/FileTypeMappingServiceTests.cs index bb2c5ea..b5c3ef6 100644 --- a/tests/WinPrint.Core.UnitTests/Services/FileTypeMappingServiceTests.cs +++ b/tests/WinPrint.Core.UnitTests/Services/FileTypeMappingServiceTests.cs @@ -45,7 +45,7 @@ public void TestDefaultConfigFiletypeMappkng() } [Fact] - public void TestDefaultConfigLangauges() + public void TestDefaultConfigLanguages() { ServiceLocator.Current.SettingsService.SettingsFileName = $"WinPrint.{GetType().Name}.json"; File.Delete(ServiceLocator.Current.SettingsService.SettingsFileName); @@ -82,7 +82,7 @@ public void TestDefaultConfigLangauges() } [Fact] - public void TestLangauges() + public void TestLanguages() { ServiceLocator.Current.SettingsService.SettingsFileName = $"WinPrint.{GetType().Name}.json"; File.Delete(ServiceLocator.Current.SettingsService.SettingsFileName);