Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup #1209

Merged
merged 3 commits into from
Sep 5, 2024
Merged

Cleanup #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
005f1ef
Remove redundant styling
ScrubN Sep 5, 2024
49723e0
Change string.Replace to string.Format
ScrubN Sep 5, 2024
9bfdfb2
Fix cut off status in queue
ScrubN Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TwitchDownloaderWPF/PageQueue.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" />
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/Services/ThemeService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/Translations/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.ja.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.pl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.pt-br.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.ru.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.tr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.uk.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Translations/Strings.zh-cn.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading