Implement localized version of ByteRate.Humanize()

This used TimeUnit.ToSymbol() as it's underlying localization, so that it only needs to be done once.
Humanizr · Jul 5, 2021 · fc32782 · fc32782
1 parent c656e78
commit fc32782
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt b/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt
@@ -1636,7 +1636,7 @@ namespace Humanizer.Bytes
         public System.TimeSpan Interval { get; }
         public Humanizer.Bytes.ByteSize Size { get; }
         public string Humanize(Humanizer.Localisation.TimeUnit timeUnit = 1) { }
-        public string Humanize(string format, Humanizer.Localisation.TimeUnit timeUnit = 1) { }
+        public string Humanize(string format, Humanizer.Localisation.TimeUnit timeUnit = 1, System.Globalization.CultureInfo culture = null) { }
     }
     public struct ByteSize : System.IComparable, System.IComparable<Humanizer.Bytes.ByteSize>, System.IEquatable<Humanizer.Bytes.ByteSize>, System.IFormattable
     {

diff --git a/src/Humanizer/Bytes/ByteRate.cs b/src/Humanizer/Bytes/ByteRate.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Globalization;
+
 using Humanizer.Localisation;
 
 namespace Humanizer.Bytes
@@ -47,34 +49,19 @@ public string Humanize(TimeUnit timeUnit = TimeUnit.Second)
         /// </summary>
         /// <param name="timeUnit">Unit of time to calculate rate for (defaults is per second)</param>
         /// <param name="format">The string format to use for the number of bytes</param>
+        /// <param name="culture">Culture to use. If null, current thread's UI culture is used.</param>
         /// <returns></returns>
-        public string Humanize(string format, TimeUnit timeUnit = TimeUnit.Second)
+        public string Humanize(string format, TimeUnit timeUnit = TimeUnit.Second, CultureInfo culture = null)
         {
-            TimeSpan displayInterval;
-            string displayUnit;
-
-            if (timeUnit == TimeUnit.Second)
-            {
-                displayInterval = TimeSpan.FromSeconds(1);
-                displayUnit = "s";
-            }
-            else if (timeUnit == TimeUnit.Minute)
+            var displayInterval = timeUnit switch
             {
-                displayInterval = TimeSpan.FromMinutes(1);
-                displayUnit = "min";
-            }
-            else if (timeUnit == TimeUnit.Hour)
-            {
-                displayInterval = TimeSpan.FromHours(1);
-                displayUnit = "hour";
-            }
-            else
-            {
-                throw new NotSupportedException("timeUnit must be Second, Minute, or Hour");
-            }
-
+                TimeUnit.Second => TimeSpan.FromSeconds(1),
+                TimeUnit.Minute => TimeSpan.FromMinutes(1),
+                TimeUnit.Hour => TimeSpan.FromHours(1),
+                _ => throw new NotSupportedException("timeUnit must be Second, Minute, or Hour"),
+            };
             return new ByteSize(Size.Bytes / Interval.TotalSeconds * displayInterval.TotalSeconds)
-                .Humanize(format) + '/' + displayUnit;
+                .Humanize(format, culture) + '/' + timeUnit.ToSymbol(culture);
         }
     }
 }