Centralize time extensions

dotnet · Mar 18, 2021 · 856738d · 856738d
1 parent ef7fb50
commit 856738d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 44 deletions.
diff --git a/...re/src/Platform/Android/TimeExtensions.cs → src/Core/src/Platform/TimeExtensions.cs b/...re/src/Platform/Android/TimeExtensions.cs → src/Core/src/Platform/TimeExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 
 namespace Microsoft.Maui
 {
@@ -12,17 +13,16 @@ public static string ToFormattedString(this ITimePicker timePicker)
 			return time.ToFormattedString(format);
 		}
 
-		public static string ToFormattedString(this TimeSpan time, string format)
+		public static string ToFormattedString(this TimeSpan time, string format, CultureInfo? cultureInfo = null)
 		{
+			cultureInfo ??= CultureInfo.CurrentCulture;
+
 			if (string.IsNullOrEmpty(format))
 			{
-				var timeFormat = "t";
-				return DateTime.Today.Add(time).ToString(timeFormat);
-			}
-			else
-			{
-				return DateTime.Today.Add(time).ToString(format);
+				format = cultureInfo.DateTimeFormat.ShortTimePattern;
 			}
+
+			return DateTime.Today.Add(time).ToString(format, cultureInfo);
 		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/TimeExtensions.cs b/src/Core/src/Platform/iOS/TimeExtensions.cs
diff --git a/src/Core/src/Platform/iOS/TimePickerExtensions.cs b/src/Core/src/Platform/iOS/TimePickerExtensions.cs
@@ -32,7 +32,6 @@ public static void UpdateTime(this MauiTimePicker nativeTimePicker, ITimePicker
 
 			if (string.IsNullOrEmpty(timePicker.Format))
 			{
-				string timeformat = cultureInfo.DateTimeFormat.ShortTimePattern;
 				NSLocale locale = new NSLocale(cultureInfo.TwoLetterISOLanguageName);
 
 				if (picker != null)