From 50a0859360bce4a220de7e31422cdaa3f9602d9a Mon Sep 17 00:00:00 2001
From: Scrub <72096833+ScrubN@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:28:11 -0400
Subject: [PATCH] Cleanup (#1209)

* Remove redundant styling

* Change string.Replace to string.Format

* Fix cut off status in queue
---
 TwitchDownloaderWPF/PageQueue.xaml                   | 4 ++--
 TwitchDownloaderWPF/Services/ThemeService.cs         | 2 +-
 TwitchDownloaderWPF/Translations/Strings.Designer.cs | 2 +-
 TwitchDownloaderWPF/Translations/Strings.es.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.fr.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.it.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.ja.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.pl.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.pt-br.resx  | 3 +--
 TwitchDownloaderWPF/Translations/Strings.resx        | 3 +--
 TwitchDownloaderWPF/Translations/Strings.ru.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.tr.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.uk.resx     | 3 +--
 TwitchDownloaderWPF/Translations/Strings.zh-cn.resx  | 3 +--
 14 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/TwitchDownloaderWPF/PageQueue.xaml b/TwitchDownloaderWPF/PageQueue.xaml
index 1f8431cb..a6b14c04 100644
--- a/TwitchDownloaderWPF/PageQueue.xaml
+++ b/TwitchDownloaderWPF/PageQueue.xaml
@@ -78,7 +78,7 @@
                                     <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,0,0,0" >
                                         <emoji:TextBlock Text="{Binding Info.Title, StringFormat=Title: {0}}" TextWrapping="Wrap" Foreground="{DynamicResource AppText}"></emoji:TextBlock>
                                         <TextBlock Text="{Binding TaskType, StringFormat=Task Type: {0}}" Foreground="{DynamicResource AppText}"></TextBlock>
-                                        <TextBlock Text="{Binding DisplayStatus, StringFormat=Status: {0}, Mode=OneWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource AppText}"></TextBlock>
+                                        <TextBlock Text="{Binding DisplayStatus, StringFormat=Status: {0}, Mode=OneWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" Foreground="{DynamicResource AppText}" />
                                         <StackPanel Orientation="Horizontal" Margin="1,1,0,1">
                                             <Button Content="{lex:Loc TaskCancel}" Margin="0,0,4,0" MinWidth="60" Height="28" FontSize="12" Click="BtnCancelTask_Click" Visibility="{Binding CanCancel, Converter={StaticResource Boolean2VisibilityConverter}}" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}" />
                                             <Button Content="{lex:Loc TaskRetry}" Margin="0,0,4,0" MinWidth="60" Height="28" FontSize="12" Click="BtnRetryTask_Click" Visibility="{Binding CanReinitialize, Converter={StaticResource Boolean2VisibilityConverter}}" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}" />
@@ -94,7 +94,7 @@
                                         <Button Padding="0" VerticalAlignment="Top" Width="22" Height="22" Margin="0, 0, 2, 0" Click="BtnMoveTaskDown_Click" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}">
                                             <fa:SvgAwesome Icon="Solid_CaretDown" Foreground="{DynamicResource AppTextDisabled}" />
                                         </Button>
-                                        <Button Padding="3" VerticalAlignment="Top" Width="22" Height="22" FontSize="12" Click="BtnRemoveTask_Click" Background="{DynamicResource AppElementBackground}" Foreground="{DynamicResource AppTextDisabled}" BorderBrush="{DynamicResource AppElementBorder}">
+                                        <Button Padding="3" VerticalAlignment="Top" Width="22" Height="22" Click="BtnRemoveTask_Click" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}">
                                             <fa:SvgAwesome Icon="Solid_Times" Foreground="{DynamicResource AppTextDisabled}" />
                                         </Button>
                                     </StackPanel>
diff --git a/TwitchDownloaderWPF/Services/ThemeService.cs b/TwitchDownloaderWPF/Services/ThemeService.cs
index 513c45d7..172fc03c 100644
--- a/TwitchDownloaderWPF/Services/ThemeService.cs
+++ b/TwitchDownloaderWPF/Services/ThemeService.cs
@@ -49,7 +49,7 @@ public ThemeService(App app, WindowsThemeService windowsThemeService)
             if (!Settings.Default.GuiTheme.Equals("System", StringComparison.OrdinalIgnoreCase) && !File.Exists(Path.Combine("Themes", $"{Settings.Default.GuiTheme}.xaml")))
             {
                 MessageBox.Show(
-                    Translations.Strings.ThemeNotFoundMessage.Replace("{theme}", $"{Settings.Default.GuiTheme}.xaml"),
+                    string.Format(Translations.Strings.ThemeNotFoundMessage, $"{Settings.Default.GuiTheme}.xaml"),
                     Translations.Strings.ThemeNotFound,
                     MessageBoxButton.OK,
                     MessageBoxImage.Information);
diff --git a/TwitchDownloaderWPF/Translations/Strings.Designer.cs b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
index c3138f44..43bb4510 100644
--- a/TwitchDownloaderWPF/Translations/Strings.Designer.cs
+++ b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
@@ -2067,7 +2067,7 @@ public static string ThemeNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {theme} was not found. Reverting theme to System.
+        ///   Looks up a localized string similar to {0} was not found. Reverting theme to System.
         /// </summary>
         public static string ThemeNotFoundMessage {
             get {
diff --git a/TwitchDownloaderWPF/Translations/Strings.es.resx b/TwitchDownloaderWPF/Translations/Strings.es.resx
index eb354af6..d2ee2578 100644
--- a/TwitchDownloaderWPF/Translations/Strings.es.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.es.resx
@@ -628,8 +628,7 @@
     <value>Tema no encontrado</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} no se ha encontrado. Revertir tema a Sistema</value>
-    <comment>No traducir {theme}</comment>
+    <value>{0} no se ha encontrado. Revertir tema a Sistema</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Dispersion </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
index 2861a1c1..c12a158f 100644
--- a/TwitchDownloaderWPF/Translations/Strings.fr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -628,8 +628,7 @@
     <value>Le thème n'a pas été trouvé</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} n'a pas été trouvé. Passage au thème système</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} n'a pas été trouvé. Passage au thème système</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Dispersion </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.it.resx b/TwitchDownloaderWPF/Translations/Strings.it.resx
index df1ffa21..fa1db3ff 100644
--- a/TwitchDownloaderWPF/Translations/Strings.it.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.it.resx
@@ -628,8 +628,7 @@
     <value>Tema non trovato</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} non è stato trovato. Ripristina tema a Sistema</value>
-    <comment>Non tradurre {theme}</comment>
+    <value>{0} non è stato trovato. Ripristina tema a Sistema</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Dispersione </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.ja.resx b/TwitchDownloaderWPF/Translations/Strings.ja.resx
index 1ad82b49..34b3998f 100644
--- a/TwitchDownloaderWPF/Translations/Strings.ja.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.ja.resx
@@ -628,8 +628,7 @@
     <value>テーマが見つかりませんでした</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} が見つかりませんでした。 テーマをシステムに戻す。</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} が見つかりませんでした。 テーマをシステムに戻す。</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>分散 </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.pl.resx b/TwitchDownloaderWPF/Translations/Strings.pl.resx
index e3b04be3..4e806e55 100644
--- a/TwitchDownloaderWPF/Translations/Strings.pl.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.pl.resx
@@ -628,8 +628,7 @@
     <value>Motyw nie znaleziony</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} nie został znaleziony. Przywracanie Systemowego motywu</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} nie został znaleziony. Przywracanie Systemowego motywu</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Rozproszenie </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.pt-br.resx b/TwitchDownloaderWPF/Translations/Strings.pt-br.resx
index 595285be..1b1e1f4c 100644
--- a/TwitchDownloaderWPF/Translations/Strings.pt-br.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.pt-br.resx
@@ -632,8 +632,7 @@
     <value>Tema não encontrado</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} não foi encontrado. Revertendo tema pro Sistema</value>
-    <comment>Não Traduza {theme}</comment>
+    <value>{0} não foi encontrado. Revertendo tema pro Sistema</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Dispersação </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
index f92974c8..9a620884 100644
--- a/TwitchDownloaderWPF/Translations/Strings.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -628,8 +628,7 @@
     <value>Theme not found</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} was not found. Reverting theme to System</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} was not found. Reverting theme to System</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Dispersion </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.ru.resx b/TwitchDownloaderWPF/Translations/Strings.ru.resx
index 07ae0e50..591d0baf 100644
--- a/TwitchDownloaderWPF/Translations/Strings.ru.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.ru.resx
@@ -628,8 +628,7 @@
     <value>Тема не найденна</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} не найденна. Откат на системную</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} не найденна. Откат на системную</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Разбиение </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.tr.resx b/TwitchDownloaderWPF/Translations/Strings.tr.resx
index b4a31ed0..23ea271b 100644
--- a/TwitchDownloaderWPF/Translations/Strings.tr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.tr.resx
@@ -629,8 +629,7 @@
     <value>Tema bulunamadı</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} bulunamadı. Sistem temasına geri döndürülüyor</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} bulunamadı. Sistem temasına geri döndürülüyor</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Dağıtma </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.uk.resx b/TwitchDownloaderWPF/Translations/Strings.uk.resx
index 74ef98e8..95df1ada 100644
--- a/TwitchDownloaderWPF/Translations/Strings.uk.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.uk.resx
@@ -628,8 +628,7 @@
     <value>Тему не знайдено</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>{theme} не знайдено. Повертаємо тему до системної</value>
-    <comment>Do not translate {theme}</comment>
+    <value>{0} не знайдено. Повертаємо тему до системної</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>Розсіювання </value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx b/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx
index dbe3a5b3..06d5de43 100644
--- a/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx
@@ -628,8 +628,7 @@
     <value>未找到主题</value>
   </data>
   <data name="ThemeNotFoundMessage" xml:space="preserve">
-    <value>未找到 {theme}。将主题还原为系统。</value>
-    <comment>Do not translate {theme}</comment>
+    <value>未找到 {0}。将主题还原为系统。</value>
   </data>
   <data name="MessageDispersion" xml:space="preserve">
     <value>散布 </value>