Fix: Fixed an issue where drive capacity was reported incorrectly (#16960)

Author: dongle-the-gadget

src/Files.App/Data/Models/ByteSize.cs

@@ -9,13 +9,13 @@ public struct ByteSize : IEquatable<ByteSize>, IComparable<ByteSize>
 	{
 		private static readonly FrozenDictionary<string, string> units = new Dictionary<string, string>
 		{
-			[ByteSizeLib.ByteSize.BitSymbol] = "ByteSymbol".ToLocalized(),
-			[ByteSizeLib.ByteSize.ByteSymbol] = "ByteSymbol".ToLocalized(),
-			[ByteSizeLib.ByteSize.KibiByteSymbol] = "KiloByteSymbol".ToLocalized(),
-			[ByteSizeLib.ByteSize.MebiByteSymbol] = "MegaByteSymbol".ToLocalized(),
-			[ByteSizeLib.ByteSize.GibiByteSymbol] = "GigaByteSymbol".ToLocalized(),
-			[ByteSizeLib.ByteSize.TebiByteSymbol] = "TeraByteSymbol".ToLocalized(),
-			[ByteSizeLib.ByteSize.PebiByteSymbol] = "PetaByteSymbol".ToLocalized(),
+			[ByteSizeLib.ByteSize.BitSymbol] = Strings.ByteSymbol.ToLocalized(),
+			[ByteSizeLib.ByteSize.ByteSymbol] = Strings.ByteSymbol.ToLocalized(),
+			[ByteSizeLib.ByteSize.KiloByteSymbol] = Strings.KiloByteSymbol.ToLocalized(),
+			[ByteSizeLib.ByteSize.MegaByteSymbol] = Strings.MegaByteSymbol.ToLocalized(),
+			[ByteSizeLib.ByteSize.GigaByteSymbol] = Strings.GigaByteSymbol.ToLocalized(),
+			[ByteSizeLib.ByteSize.TeraByteSymbol] = Strings.TeraByteSymbol.ToLocalized(),
+			[ByteSizeLib.ByteSize.PetaByteSymbol] = Strings.PetaByteSymbol.ToLocalized(),
 		}.ToFrozenDictionary();
 
 		private readonly ByteSizeLib.ByteSize size;
@@ -28,7 +28,7 @@ public ulong Bytes
 			=> (ulong)size.Bytes;
 
 		public string ShortString
-			=> $"{size.LargestWholeNumberBinaryValue:0.##} {units[size.LargestWholeNumberBinarySymbol]}";
+			=> $"{size.LargestWholeNumberDecimalValue:0.##} {units[size.LargestWholeNumberDecimalSymbol]}";
 
 		public string LongString
 			=> $"{ShortString} ({size.Bytes:#,##0} {units[ByteSizeLib.ByteSize.ByteSymbol]})";

src/Files.App/Extensions/StringExtensions.cs

@@ -60,13 +60,13 @@ public static string WithEnding(this string str, string ending)
 
 		private static readonly Dictionary<string, string> abbreviations = new()
 		{
-			{ "KiB", "KiloByteSymbol".GetLocalizedResource() },
-			{ "MiB", "MegaByteSymbol".GetLocalizedResource() },
-			{ "GiB", "GigaByteSymbol".GetLocalizedResource() },
-			{ "TiB", "TeraByteSymbol".GetLocalizedResource() },
-			{ "PiB", "PetaByteSymbol".GetLocalizedResource() },
-			{ "B", "ByteSymbol".GetLocalizedResource() },
-			{ "b", "ByteSymbol".GetLocalizedResource() }
+			{ ByteSize.KiloByteSymbol, Strings.KiloByteSymbol.GetLocalizedResource() },
+			{ ByteSize.MegaByteSymbol, Strings.MegaByteSymbol.GetLocalizedResource() },
+			{ ByteSize.GigaByteSymbol, Strings.GigaByteSymbol.GetLocalizedResource() },
+			{ ByteSize.TeraByteSymbol, Strings.TeraByteSymbol.GetLocalizedResource() },
+			{ ByteSize.PetaByteSymbol, Strings.PetaByteSymbol.GetLocalizedResource() },
+			{ ByteSize.BitSymbol, Strings.ByteSymbol.GetLocalizedResource() },
+			{ ByteSize.ByteSymbol, Strings.ByteSymbol.GetLocalizedResource() }
 		};
 
 		public static string ConvertSizeAbbreviation(this string value)
@@ -83,7 +83,7 @@ public static string ConvertSizeAbbreviation(this string value)
 		public static string ToSizeString(this long size) => ByteSize.FromBytes(size).ToSizeString();
 		public static string ToSizeString(this ulong size) => ByteSize.FromBytes(size).ToSizeString();
 		public static string ToSizeString(this decimal size) => ByteSize.FromBytes((double)size).ToSizeString();
-		public static string ToSizeString(this ByteSize size) => size.ToBinaryString().ConvertSizeAbbreviation();
+		public static string ToSizeString(this ByteSize size) => size.ToString().ConvertSizeAbbreviation();
 
 		public static string ToLongSizeString(this long size) => ByteSize.FromBytes(size).ToLongSizeString();
 		public static string ToLongSizeString(this ulong size) => ByteSize.FromBytes(size).ToLongSizeString();