Changed format Culture to CultureInfo.InvariantCulture to match defau…

…lt NLog Culture (#735)
NLog · Dec 2, 2021 · c1c8a98 · c1c8a98
1 parent dbc54b9
commit c1c8a98
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 30 deletions.
diff --git a/src/NLog.Web/LayoutRenderers/AspNetApplicationValueLayoutRenderer.cs b/src/NLog.Web/LayoutRenderers/AspNetApplicationValueLayoutRenderer.cs
@@ -43,6 +43,12 @@ public class AspNetApplicationValueLayoutRenderer : AspNetLayoutRendererBase
         [DefaultParameter]
         public string Variable { get; set; }
 
+        /// <summary>
+        /// Gets or sets the culture used for rendering.
+        /// </summary>
+        /// <docgen category='Rendering Options' order='10' />
+        public CultureInfo Culture { get; set; } = CultureInfo.InvariantCulture;
+
         /// <summary>
         /// Renders the specified ASP.NET Application variable and appends it to the specified <see cref="StringBuilder" />.
         /// </summary>
@@ -60,8 +66,9 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             {
                 return;
             }
-
-            builder.Append(Convert.ToString(application[Variable], CultureInfo.CurrentUICulture));
+
+            var culture = GetFormatProvider(logEvent, Culture);
+            builder.Append(Convert.ToString(application[Variable], culture));
         }
     }
 }
diff --git a/src/Shared/LayoutRenderers/AspNetItemValueLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetItemValueLayoutRenderer.cs
@@ -43,14 +43,6 @@ namespace NLog.Web.LayoutRenderers
     [LayoutRenderer("aspnet-item")]
     public class AspNetItemValueLayoutRenderer : AspNetLayoutRendererBase
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AspNetItemValueLayoutRenderer" /> class.
-        /// </summary>
-        public AspNetItemValueLayoutRenderer()
-        {
-            Culture = CultureInfo.CurrentUICulture;
-        }
-
         /// <summary>
         /// Gets or sets the item variable name.
         /// </summary>
@@ -68,7 +60,7 @@ public AspNetItemValueLayoutRenderer()
         /// Gets or sets the culture used for rendering.
         /// </summary>
         /// <docgen category='Rendering Options' order='10' />
-        public CultureInfo Culture { get; set; }
+        public CultureInfo Culture { get; set; } = CultureInfo.InvariantCulture;
 
         /// <summary>
         /// Renders the specified ASP.NET Item value and appends it to the specified <see cref="StringBuilder" />.

diff --git a/src/Shared/LayoutRenderers/AspNetRequestDurationLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetRequestDurationLayoutRenderer.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using NLog.Config;
@@ -31,14 +32,14 @@ public class AspNetRequestDurationLayoutRenderer : AspNetLayoutRendererBase
         /// Gets or sets the culture used for rendering. 
         /// </summary>
         /// <docgen category='Rendering Options' order='10' />
-        public System.Globalization.CultureInfo Culture { get; set; } = System.Globalization.CultureInfo.InvariantCulture;
+        public CultureInfo Culture { get; set; } = CultureInfo.InvariantCulture;
 
         /// <inheritdoc/>
         protected override void InitializeLayoutRenderer()
         {
-            if (DurationMsFormat == null && string.IsNullOrEmpty(Format) && ReferenceEquals(Culture, System.Globalization.CultureInfo.InvariantCulture))
+            if (DurationMsFormat == null && string.IsNullOrEmpty(Format) && ReferenceEquals(Culture, CultureInfo.InvariantCulture))
             {
-                System.Threading.Interlocked.CompareExchange(ref DurationMsFormat, Enumerable.Range(0, 1000).Select(i => i.ToString(System.Globalization.CultureInfo.InvariantCulture)).ToArray(), null);
+                System.Threading.Interlocked.CompareExchange(ref DurationMsFormat, Enumerable.Range(0, 1000).Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray(), null);
             }
 
 #if !ASP_NET_CORE
@@ -47,9 +48,9 @@ protected override void InitializeLayoutRenderer()
                 _formatString = "{0:" + Format + "}";
             }
 #elif ASP_NET_CORE2
-            if (string.IsNullOrEmpty(Format) && ReferenceEquals(Culture, System.Globalization.CultureInfo.InvariantCulture))
+            if (string.IsNullOrEmpty(Format) && ReferenceEquals(Culture, CultureInfo.InvariantCulture))
                 _scopeTiming = new NLog.Layouts.SimpleLayout("${scopetiming}");
-            else if (ReferenceEquals(Culture, System.Globalization.CultureInfo.InvariantCulture))
+            else if (ReferenceEquals(Culture, CultureInfo.InvariantCulture))
                 _scopeTiming = new NLog.Layouts.SimpleLayout($"${{scopetiming:Format={Format}}}");
             else
                 _scopeTiming = new NLog.Layouts.SimpleLayout($"${{scopetiming:Format={Format}:Culture={Culture}}}");
@@ -92,7 +93,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
 
         private void RenderDurationMs(StringBuilder builder, double durationMs)
         {
-            if (ReferenceEquals(Culture, System.Globalization.CultureInfo.InvariantCulture))
+            if (ReferenceEquals(Culture, CultureInfo.InvariantCulture))
             {
                 var truncateMs = (long)durationMs;
                 if (DurationMsFormat != null && truncateMs >= 0 && truncateMs <= DurationMsFormat.Length)

diff --git a/src/Shared/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs
@@ -44,13 +44,6 @@ public class AspNetSessionValueLayoutRenderer : AspNetLayoutRendererBase
 #if ASP_NET_CORE
         private const string NLogRetrievingSessionValue = "NLogRetrievingSessionValue";
 #endif
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AspNetSessionValueLayoutRenderer" /> class.
-        /// </summary>
-        public AspNetSessionValueLayoutRenderer()
-        {
-            Culture = CultureInfo.CurrentUICulture;
-        }
 
         /// <summary>
         /// Gets or sets the session variable name.
@@ -69,7 +62,7 @@ public AspNetSessionValueLayoutRenderer()
         /// Gets or sets the culture used for rendering.
         /// </summary>
         /// <docgen category='Rendering Options' order='10' />
-        public CultureInfo Culture { get; set; }
+        public CultureInfo Culture { get; set; } = CultureInfo.InvariantCulture;
 
 #if ASP_NET_CORE
         /// <summary>

diff --git a/tests/NLog.Web.Tests/LayoutRenderers/AspNetApplicationValueLayoutRendererTests.cs b/tests/NLog.Web.Tests/LayoutRenderers/AspNetApplicationValueLayoutRendererTests.cs
@@ -63,13 +63,15 @@ public void VariableFoundRendersValue(object expectedValue)
             var httpContext = Substitute.For<HttpContextBase>();
             httpContext.Application["key"].Returns(expectedValue);
 
+            var culture = CultureInfo.CurrentUICulture;
             var renderer = new AspNetApplicationValueLayoutRenderer();
             renderer.Variable = "key";
             renderer.HttpContextAccessor = new FakeHttpContextAccessor(httpContext);
+            renderer.Culture = culture;
 
             string result = renderer.Render(new LogEventInfo());
 
-            Assert.Equal(Convert.ToString(expectedValue, CultureInfo.CurrentUICulture), result);
+            Assert.Equal(Convert.ToString(expectedValue, culture), result);
         }
 
         public static IEnumerable<object[]> VariableFoundData

diff --git a/tests/Shared/LayoutRenderers/AspNetItemValueLayoutRendererTests.cs b/tests/Shared/LayoutRenderers/AspNetItemValueLayoutRendererTests.cs
@@ -84,14 +84,15 @@ public void VariableFoundRendersValue(object expectedValue)
             httpContext.Items.Contains("key").Returns(true);
             httpContext.Items["key"].Returns(expectedValue);
 #endif
-
+            var culture = CultureInfo.CurrentUICulture;
             renderer.Variable = "key";
+            renderer.Culture = culture;
 
             // Act
             string result = renderer.Render(new LogEventInfo());
 
             // Assert
-            Assert.Equal(Convert.ToString(expectedValue, CultureInfo.CurrentUICulture), result);
+            Assert.Equal(Convert.ToString(expectedValue, culture), result);
         }
 
         [Theory, MemberData(nameof(NestedPropertyData))]
@@ -106,15 +107,16 @@ public void NestedPropertyRendersValue(string itemKey, string variable, object d
             httpContext.Items.Contains(itemKey).Returns(true);
             httpContext.Items[itemKey].Returns(data);
 #endif
-
+            var culture = CultureInfo.CurrentUICulture;
             renderer.Variable = variable;
             renderer.EvaluateAsNestedProperties = true;
+            renderer.Culture = culture;
 
             // Act
             string result = renderer.Render(new LogEventInfo());
 
             // Assert
-            Assert.Equal(Convert.ToString(expectedValue, CultureInfo.CurrentUICulture), result);
+            Assert.Equal(Convert.ToString(expectedValue, culture), result);
         }
 
         public static IEnumerable<object[]> VariableFoundData