diff --git a/src/NSwag.Commands/Commands/Generation/OpenApiGeneratorCommandBase.cs b/src/NSwag.Commands/Commands/Generation/OpenApiGeneratorCommandBase.cs index 0b3acbf67f..9ed0832a30 100644 --- a/src/NSwag.Commands/Commands/Generation/OpenApiGeneratorCommandBase.cs +++ b/src/NSwag.Commands/Commands/Generation/OpenApiGeneratorCommandBase.cs @@ -70,7 +70,7 @@ public ReferenceTypeNullHandling DefaultResponseReferenceTypeNullHandling set => Settings.DefaultResponseReferenceTypeNullHandling = value; } - [Argument(Name = nameof(GenerateOriginalParameterNames), IsRequired = false, Description = "Generate x-originalName properties when parameter name is differnt in .NET and HTTP (default: true).")] + [Argument(Name = nameof(GenerateOriginalParameterNames), IsRequired = false, Description = "Generate x-originalName properties when parameter name is different in .NET and HTTP (default: true).")] public bool GenerateOriginalParameterNames { get => Settings.GenerateOriginalParameterNames; diff --git a/src/NSwag.Generation/OpenApiDocumentGeneratorSettings.cs b/src/NSwag.Generation/OpenApiDocumentGeneratorSettings.cs index 6f4d1e9b11..1976e52996 100644 --- a/src/NSwag.Generation/OpenApiDocumentGeneratorSettings.cs +++ b/src/NSwag.Generation/OpenApiDocumentGeneratorSettings.cs @@ -46,7 +46,7 @@ public OpenApiDocumentGeneratorSettings() /// Gets or sets the default response reference type null handling when no nullability information is available (if NotNullAttribute and CanBeNullAttribute are missing, default: NotNull). public ReferenceTypeNullHandling DefaultResponseReferenceTypeNullHandling { get; set; } - /// Gets or sets a value indicating whether to generate x-originalName properties when parameter name is differnt in .NET and HTTP (default: true). + /// Gets or sets a value indicating whether to generate x-originalName properties when parameter name is different in .NET and HTTP (default: true). public bool GenerateOriginalParameterNames { get; set; } = true; /// Gets the operation processors. diff --git a/src/NSwag.Integration.ClientPCL/ServiceClients.cs b/src/NSwag.Integration.ClientPCL/ServiceClients.cs index 2e17ba2cfd..c55a467182 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClients.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClients.cs @@ -645,7 +645,7 @@ public virtual async System.Threading.Tasks.Task UploadFilesAsy } /// A server side error occurred. - /// A custom error occured. + /// A custom error occurred. public virtual System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request) { return SaveItemsAsync(request, System.Threading.CancellationToken.None); @@ -653,7 +653,7 @@ public virtual System.Threading.Tasks.Task SaveItemsAsync(Gener /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. - /// A custom error occured. + /// A custom error occurred. public virtual async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); @@ -707,7 +707,7 @@ public virtual async System.Threading.Tasks.Task SaveItemsAsync responseObject_.Data.Add("HttpStatus", status_.ToString()); responseObject_.Data.Add("HttpHeaders", headers_); responseObject_.Data.Add("HttpResponse", objectResponse_.Text); - throw new GeoClientException("A custom error occured.", status_, objectResponse_.Text, headers_, responseObject_); + throw new GeoClientException("A custom error occurred.", status_, objectResponse_.Text, headers_, responseObject_); } else { diff --git a/src/NSwag.Integration.ClientPCL/swagger.json b/src/NSwag.Integration.ClientPCL/swagger.json index f2c7c88a00..1694cb4a0d 100644 --- a/src/NSwag.Integration.ClientPCL/swagger.json +++ b/src/NSwag.Integration.ClientPCL/swagger.json @@ -241,7 +241,7 @@ }, "450": { "x-nullable": false, - "description": "A custom error occured.", + "description": "A custom error occurred.", "schema": { "$ref": "#/definitions/Exception" } diff --git a/src/NSwag.Integration.Console/ServiceClients.cs b/src/NSwag.Integration.Console/ServiceClients.cs index 09a9c4707a..328a084f0e 100644 --- a/src/NSwag.Integration.Console/ServiceClients.cs +++ b/src/NSwag.Integration.Console/ServiceClients.cs @@ -638,7 +638,7 @@ public virtual async System.Threading.Tasks.Task UploadFilesAsync(System.Collect } /// A server side error occurred. - /// A custom error occured. + /// A custom error occurred. public virtual System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request) { return SaveItemsAsync(request, System.Threading.CancellationToken.None); @@ -646,7 +646,7 @@ public virtual System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddres /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. - /// A custom error occured. + /// A custom error occurred. public virtual async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); @@ -700,7 +700,7 @@ public virtual async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOf responseObject_.Data.Add("HttpStatus", status_.ToString()); responseObject_.Data.Add("HttpHeaders", headers_); responseObject_.Data.Add("HttpResponse", objectResponse_.Text); - throw new SwaggerException("A custom error occured.", status_, objectResponse_.Text, headers_, responseObject_); + throw new SwaggerException("A custom error occurred.", status_, objectResponse_.Text, headers_, responseObject_); } else { diff --git a/src/NSwag.Integration.WebAPI/Controllers/GeoController.cs b/src/NSwag.Integration.WebAPI/Controllers/GeoController.cs index 6cacb47e66..d17fa124b7 100644 --- a/src/NSwag.Integration.WebAPI/Controllers/GeoController.cs +++ b/src/NSwag.Integration.WebAPI/Controllers/GeoController.cs @@ -67,7 +67,7 @@ public void UploadFiles(IEnumerable files) [HttpPost] [ResponseType("204", typeof(void))] - [ResponseType("450", typeof(Exception), Description = "A custom error occured.")] + [ResponseType("450", typeof(Exception), Description = "A custom error occurred.")] public void SaveItems(GenericRequest request) { throw new ArgumentException("Test"); diff --git a/src/NSwagStudio/ViewModels/ViewModelBase.cs b/src/NSwagStudio/ViewModels/ViewModelBase.cs index b85a48b824..683bc772f5 100644 --- a/src/NSwagStudio/ViewModels/ViewModelBase.cs +++ b/src/NSwagStudio/ViewModels/ViewModelBase.cs @@ -20,7 +20,7 @@ public class ViewModelBase : MyToolkit.Mvvm.ViewModelBase /// The exception. public override void HandleException(Exception exception) { - ExceptionBox.Show("An error occured", exception, Application.Current.MainWindow); + ExceptionBox.Show("An error occurred", exception, Application.Current.MainWindow); } protected string FromStringArray(string[] array) diff --git a/src/NSwagStudio/Views/SwaggerGenerators/AspNetCoreToSwaggerGeneratorView.xaml b/src/NSwagStudio/Views/SwaggerGenerators/AspNetCoreToSwaggerGeneratorView.xaml index e83a75a82a..1a2f5cdf7e 100644 --- a/src/NSwagStudio/Views/SwaggerGenerators/AspNetCoreToSwaggerGeneratorView.xaml +++ b/src/NSwagStudio/Views/SwaggerGenerators/AspNetCoreToSwaggerGeneratorView.xaml @@ -174,7 +174,7 @@ ToolTip="DefaultResponseReferenceTypeNullHandling" ItemsSource="{Binding ReferenceTypeNullHandlings}" Margin="0,0,0,12" /> - + diff --git a/src/NSwagStudio/Views/SwaggerGenerators/WebApiToSwaggerGeneratorView.xaml b/src/NSwagStudio/Views/SwaggerGenerators/WebApiToSwaggerGeneratorView.xaml index edf3364548..78ce239069 100644 --- a/src/NSwagStudio/Views/SwaggerGenerators/WebApiToSwaggerGeneratorView.xaml +++ b/src/NSwagStudio/Views/SwaggerGenerators/WebApiToSwaggerGeneratorView.xaml @@ -166,7 +166,7 @@ ToolTip="DefaultResponseReferenceTypeNullHandling" ItemsSource="{Binding ReferenceTypeNullHandlings}" Margin="0,0,0,12" /> - +