Merge pull request dapr#1053 from erwinkramer/master

InvariantCulture to fix localization
paulyuk · Jul 31, 2024 · a5e8f5d · a5e8f5d
2 parents 309d6b3 + af8ee64
commit a5e8f5d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 22 deletions.
diff --git a/bindings/csharp/http/batch/program.cs b/bindings/csharp/http/batch/program.cs
@@ -10,13 +10,12 @@ You may obtain a copy of the License at
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-using System;
-using System.IO;
+
+using Microsoft.AspNetCore.Localization;
+using System.Globalization;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Mvc;
-
 
 //dapr run --app-id batch-http --app-port 7001 --resources-path ../../../components -- dotnet run
 
@@ -28,20 +27,32 @@ limitations under the License.
 var daprUrl = $"{baseURL}:{daprPort}/v1.0/bindings/{sqlBindingName}";
 
 var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.Configure<RequestLocalizationOptions>(options =>
+{
+     var invariantCulture = CultureInfo.InvariantCulture;
+     options.DefaultRequestCulture = new RequestCulture(invariantCulture);
+     options.SupportedCultures = [invariantCulture];
+});
+
 var app = builder.Build();
 
-if (app.Environment.IsDevelopment()) {app.UseDeveloperExceptionPage();}
+if (app.Environment.IsDevelopment()) { app.UseDeveloperExceptionPage(); }
+
+app.UseRequestLocalization();
 
 var httpClient = new HttpClient();
 httpClient.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
 
 // Triggered by Dapr input binding
-app.MapPost("/" + cronBindingName, async () => {
+app.MapPost("/" + cronBindingName, async () =>
+{
      Console.WriteLine("Processing batch..");
 
      string jsonFile = File.ReadAllText("../../../orders.json");
      var ordersArray = JsonSerializer.Deserialize<Orders>(jsonFile);
-     foreach(Order ord in ordersArray?.orders ?? new Order[] {}){
+     foreach (Order ord in ordersArray?.orders ?? new Order[] { })
+     {
           var sqlText = $"insert into orders (orderid, customer, price) values ({ord.OrderId}, '{ord.Customer}', {ord.Price});";
           var payload = new DaprPayload(sql: new DaprPostgresBindingMetadata(cmd: sqlText), operation: "exec");
           var orderJson = JsonSerializer.Serialize<DaprPayload>(payload);
@@ -50,19 +61,21 @@ limitations under the License.
           Console.WriteLine(sqlText);
 
           // Insert order using Dapr output binding via HTTP Post
-          try {
+          try
+          {
                var resp = await httpClient.PostAsync(daprUrl, content);
                resp.EnsureSuccessStatusCode();
-          } 
-          catch (HttpRequestException e) {
+          }
+          catch (HttpRequestException e)
+          {
                Console.WriteLine(e.ToString());
                throw e;
           }
 
      }
-               
+
      Console.WriteLine("Finished processing batch");
-     
+
      return Results.Ok();
 });
 

diff --git a/bindings/csharp/sdk/batch/program.cs b/bindings/csharp/sdk/batch/program.cs
@@ -10,35 +10,45 @@ You may obtain a copy of the License at
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-using System;
-using System.IO;
-using System.Text;
+
+using Microsoft.AspNetCore.Localization;
+using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Mvc;
 using Dapr.Client;
 
-
 // dapr run --app-id batch-sdk --app-port 7002 --resources-path ../../../components -- dotnet run
 
 var cronBindingName = "cron";
 var sqlBindingName = "sqldb";
 
 var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.Configure<RequestLocalizationOptions>(options =>
+{
+    var invariantCulture = CultureInfo.InvariantCulture;
+    options.DefaultRequestCulture = new RequestCulture(invariantCulture);
+    options.SupportedCultures = [invariantCulture];
+});
+
 var app = builder.Build();
 
-if (app.Environment.IsDevelopment()) {app.UseDeveloperExceptionPage();}
+if (app.Environment.IsDevelopment()) { app.UseDeveloperExceptionPage(); }
 
-// Triggered by Dapr input binding
-app.MapPost("/" + cronBindingName, async () => {
+app.UseRequestLocalization();
 
+// Triggered by Dapr input binding
+app.MapPost("/" + cronBindingName, async () =>
+{
     Console.WriteLine("Processing batch..");
+
     string jsonFile = File.ReadAllText("../../../orders.json");
     var ordersArray = JsonSerializer.Deserialize<Orders>(jsonFile);
     using var client = new DaprClientBuilder().Build();
-    foreach(Order ord in ordersArray?.orders ?? new Order[] {}){
+    foreach (Order ord in ordersArray?.orders ?? new Order[] { })
+    {
         var sqlText = $"insert into orders (orderid, customer, price) values ({ord.OrderId}, '{ord.Customer}', {ord.Price});";
-        var command = new Dictionary<string,string>(){
+        var command = new Dictionary<string, string>(){
             {"sql",
             sqlText}
         };