move size formatting to separate service and add translations

BeloMaximka · Apr 23, 2023 · 4ce20d0 · 4ce20d0
1 parent eaf054d
commit 4ce20d0
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 15 deletions.
diff --git a/MystatDesktopWpf/Languages/lang.en-US.xaml b/MystatDesktopWpf/Languages/lang.en-US.xaml
@@ -190,4 +190,10 @@
     <!-- Windows settings -->
     <v:String x:Key="m_WindowsSettings">Windows settings</v:String>
     <v:String x:Key="m_RunOnWindowsStartup">Run on Windows startup</v:String>
+
+    <!-- sizes -->
+    <v:String x:Key="size-b">B</v:String>
+    <v:String x:Key="size-kb">KB</v:String>
+    <v:String x:Key="size-mb">MB</v:String>
+    <v:String x:Key="size-gb">GB</v:String>
 </ResourceDictionary>
diff --git a/MystatDesktopWpf/Languages/lang.ru-RU.xaml b/MystatDesktopWpf/Languages/lang.ru-RU.xaml
@@ -189,4 +189,10 @@
     <!-- Windows settings -->
     <v:String x:Key="m_WindowsSettings">Настройки Windows</v:String>
     <v:String x:Key="m_RunOnWindowsStartup">Запускать при старте Windows</v:String>
+
+    <!-- sizes -->
+    <v:String x:Key="size-b">Б</v:String>
+    <v:String x:Key="size-kb">КБ</v:String>
+    <v:String x:Key="size-mb">МБ</v:String>
+    <v:String x:Key="size-gb">ГБ</v:String>
 </ResourceDictionary>
diff --git a/MystatDesktopWpf/Languages/lang.uk-UA.xaml b/MystatDesktopWpf/Languages/lang.uk-UA.xaml
@@ -189,4 +189,10 @@
     <!-- Windows settings -->
     <v:String x:Key="m_WindowsSettings">Налаштування Windows</v:String>
     <v:String x:Key="m_RunOnWindowsStartup">Запускати під час старту Windows</v:String>
+
+    <!-- sizes -->
+    <v:String x:Key="size-b">Б</v:String>
+    <v:String x:Key="size-kb">КБ</v:String>
+    <v:String x:Key="size-mb">МБ</v:String>
+    <v:String x:Key="size-gb">ГБ</v:String>
 </ResourceDictionary>
diff --git a/MystatDesktopWpf/Services/SizeFormatterService.cs b/MystatDesktopWpf/Services/SizeFormatterService.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MystatDesktopWpf.Services
+{
+    internal static class SizeFormatterService
+    {
+        static string[] sizeLabelKeys = new string[] { "size-b", "size-kb", "size-mb", "size-gb" };
+
+        public static string Format(long sizeInBytes)
+        {
+            double cacheSize = sizeInBytes;
+            string label = sizeLabelKeys[0];
+
+            int i = 0;
+            while (cacheSize >= 1024)
+            {
+                cacheSize = Math.Round(cacheSize / 1024.0, 2, MidpointRounding.ToZero);
+                label = sizeLabelKeys[++i];
+            }
+
+            return $"{cacheSize} {App.Current.FindResource(label)}";
+        }
+    }
+}
diff --git a/MystatDesktopWpf/UserControls/SettingsSections/CacheSettings.xaml.cs b/MystatDesktopWpf/UserControls/SettingsSections/CacheSettings.xaml.cs
@@ -21,8 +21,6 @@ namespace MystatDesktopWpf.UserControls.SettingsSections
 	/// </summary>
 	public partial class CacheSettings : UserControl
 	{
-		static string[] cacheSizeLabels = new string[] { "B", "KB", "MB", "GB" };
-
 		public CacheSettings()
 		{
 			InitializeComponent();
@@ -52,19 +50,7 @@ public async void UpdateCacheSize()
 			CacheSizeTextBlock.SetResourceReference(TextBlock.TextProperty, "m_Calculating");
 
 			long cacheSizeInBytes = await MystatAPICachingService.GetCacheSize();
-
-
-			double cacheSize = cacheSizeInBytes;
-			string label = cacheSizeLabels[0];
-
-			int i = 0;
-            while (cacheSize >= 1024)
-            {
-                cacheSize = Math.Round(cacheSize / 1024.0, 2, MidpointRounding.ToZero);
-				label = cacheSizeLabels[++i];
-            }
-
-            CacheSizeTextBlock.Text = $"{cacheSize} {label}";
+            CacheSizeTextBlock.Text = SizeFormatterService.Format(cacheSizeInBytes);
 		}
 	}
 }