Skip to content

Commit

Permalink
Update v1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
rabanti-github committed Dec 3, 2023
1 parent 2313b09 commit 8c7e2d6
Show file tree
Hide file tree
Showing 21 changed files with 614 additions and 18 deletions.
11 changes: 10 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## v1.10.0

Release Date: **03.12.2023**

- Added Japanese translation
- Updated installer (uninstall handling)
- Project maintenance
- Updated readme

## v1.9.0

Release Date: **15.11.2023**
Expand All @@ -14,7 +23,7 @@ Note: Due to an error in the installer of the previous version 1.8, the upgrade

## v1.8.0

Release Date: **04.10.2022**
Release Date: **04.10.2023**

- Added French translation
- Added installer
Expand Down
3 changes: 2 additions & 1 deletion InstallerBootstrap/TemplateProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

using System.IO;
using System.Text;

namespace InstallerBootstrap
{
Expand Down Expand Up @@ -34,7 +35,7 @@ public TemplateProcessor(string templatePath)

public void SaveFile(string path)
{
File.WriteAllText(path, TemplateText);
File.WriteAllText(path, TemplateText, Encoding.UTF8);
}

public void SetAppName(string appName)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Raphael Stoeckli
Copyright (c) 2023 Raphael Stoeckli

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
20 changes: 19 additions & 1 deletion MediaExtractor/I18N.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace MediaExtractor
public class I18n
{
/// <summary>
/// Keys of the I18n resources. The keys must EXACTLY math with the names in the resx files
/// Keys of the I18n resources. The keys must EXACTLY match with the names in the resx files
/// </summary>
public enum Key
{
Expand Down Expand Up @@ -87,6 +87,7 @@ public enum Key
MenuAppearanceLanguageEnglish,
MenuAppearanceLanguageGerman,
MenuAppearanceLanguageFrench,
MenuAppearanceLanguageJapanese,
MenuAppearanceLanguageSpanish,
MenuDocument,
MenuDocumentGenerictextPreview,
Expand Down Expand Up @@ -150,6 +151,10 @@ public enum Key
/// </summary>
public const string FRENCH = "fr-FR";
/// <summary>
/// Locale identifier for Japanese (ja-JP)
/// </summary>
public const string JAPANESE = "ja-JP";
/// <summary>
/// Locale identifier for Spanish (es-ES)
/// </summary>
public const string SPANISH = "es-ES";
Expand All @@ -173,27 +178,39 @@ public static void MatchLocale(ViewModel viewModel, string currentLocale)
viewModel.UseEnglishLocale = true;
viewModel.UseGermanLocale = false;
viewModel.UseFrenchLocale = false;
viewModel.UseJapaneseLocale = false;
viewModel.UseSpanishLocale = false;
viewModel.UseSystemLocale = false;
break;
case GERMAN:
viewModel.UseEnglishLocale = false;
viewModel.UseGermanLocale = true;
viewModel.UseFrenchLocale = false;
viewModel.UseJapaneseLocale = false;
viewModel.UseSpanishLocale = false;
viewModel.UseSystemLocale = false;
break;
case FRENCH:
viewModel.UseEnglishLocale = false;
viewModel.UseGermanLocale = false;
viewModel.UseFrenchLocale = true;
viewModel.UseJapaneseLocale = false;
viewModel.UseSpanishLocale = false;
viewModel.UseSystemLocale = false;
break;
case JAPANESE:
viewModel.UseEnglishLocale = false;
viewModel.UseGermanLocale = false;
viewModel.UseFrenchLocale = false;
viewModel.UseJapaneseLocale = true;
viewModel.UseSpanishLocale = false;
viewModel.UseSystemLocale = false;
break;
case SPANISH:
viewModel.UseEnglishLocale = false;
viewModel.UseGermanLocale = false;
viewModel.UseFrenchLocale = false;
viewModel.UseJapaneseLocale = false;
viewModel.UseSpanishLocale = true;
viewModel.UseSystemLocale = false;
break;
Expand Down Expand Up @@ -257,6 +274,7 @@ private static void SetSystemLocale(ViewModel viewModel)
viewModel.UseEnglishLocale = false;
viewModel.UseGermanLocale = false;
viewModel.UseFrenchLocale = false;
viewModel.UseJapaneseLocale = false;
viewModel.UseSpanishLocale = false;
viewModel.UseSystemLocale = true;
}
Expand Down
3 changes: 2 additions & 1 deletion MediaExtractor/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<MenuItem x:Name="EnglishMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageEnglish}" IsCheckable="True" IsChecked="{Binding Path=UseEnglishLocale}" Click="EnglishMenuItem_Click" />
<MenuItem x:Name="GermanhMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageGerman}" IsCheckable="True" IsChecked="{Binding Path=UseGermanLocale}" Click="GermanMenuItem_Click" />
<MenuItem x:Name="FrenchMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageFrench}" IsCheckable="True" IsChecked="{Binding Path=UseFrenchLocale}" Click="FrenchMenuItem_Click" />
<MenuItem x:Name="JapaneseMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageJapanese}" IsCheckable="True" IsChecked="{Binding Path=UseJapaneseLocale}" Click="JapaneseMenuItem_Click" />
<MenuItem x:Name="SpanishMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageSpanish}" IsCheckable="True" IsChecked="{Binding Path=UseSpanishLocale}" Click="SpanishMenuItem_Click" />


Expand All @@ -107,7 +108,7 @@
<Grid Grid.Column="0">
<StackPanel Orientation="Horizontal">
<Button x:Name="OpenFileButton" Content="{x:Static p:Resources.ButtonOpen}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="115" Click="OpenFileButton_Click"/>
<Label x:Name="DragField" Style="{StaticResource roundedBorder}" Margin="10,10,0,0" VerticalAlignment="Top" Width="111" Height="54" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Drop="DragField_Drop" AllowDrop="True">
<Label x:Name="DragField" Style="{StaticResource roundedBorder}" Margin="10,10,0,0" VerticalAlignment="Top" Width="160" Height="54" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Drop="DragField_Drop" AllowDrop="True">
<TextBlock TextAlignment="Center" TextWrapping="Wrap" Text="{x:Static p:Resources.DropAreaWatermark}" />
</Label>
</StackPanel>
Expand Down
10 changes: 10 additions & 0 deletions MediaExtractor/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,16 @@ private void FrenchMenuItem_Click(object sender, RoutedEventArgs e)
ChangeLocale(I18n.FRENCH);
}

/// <summary>
/// Enables Japanese as application language
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
private void JapaneseMenuItem_Click(object sender, RoutedEventArgs e)
{
ChangeLocale(I18n.JAPANESE);
}

/// <summary>
/// Enables Spanish as application language
/// </summary>
Expand Down
18 changes: 18 additions & 0 deletions MediaExtractor/MediaExtractor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@
<Compile Include="ExtractorItem.cs" />
<Compile Include="I18N.cs" />
<Compile Include="Preview.cs" />
<Compile Include="Properties\Resources.ja-JP.Designer.cs">
<DependentUpon>Resources.ja-JP.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -173,6 +178,10 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.ja-JP.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.ja-JP.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
Expand All @@ -193,6 +202,15 @@
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.es-ES.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="..\Changelog.md">
<Link>Other\Changelog.md</Link>
</None>
<None Include="..\LICENSE">
<Link>Other\LICENSE</Link>
</None>
<None Include="..\README.md">
<Link>Other\README.md</Link>
</None>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
Expand Down
4 changes: 2 additions & 2 deletions MediaExtractor/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@


// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.9.0.0")]
[assembly: AssemblyFileVersion("1.9.0.0")]
[assembly: AssemblyVersion("1.10.0.0")]
[assembly: AssemblyFileVersion("1.10.0.0")]
[assembly: Guid("691EE0C3-5FD3-42CF-992D-BF7706176E13")]
9 changes: 9 additions & 0 deletions MediaExtractor/Properties/Resources.Designer.cs

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

3 changes: 3 additions & 0 deletions MediaExtractor/Properties/Resources.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -459,4 +459,7 @@
<data name="MenuAppearanceLanguageSpanish" xml:space="preserve">
<value>Spanisch (Español)</value>
</data>
<data name="MenuAppearanceLanguageJapanese" xml:space="preserve">
<value>Japanisch (日本語)</value>
</data>
</root>
3 changes: 3 additions & 0 deletions MediaExtractor/Properties/Resources.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -459,4 +459,7 @@
<data name="MenuAppearanceLanguageSpanish" xml:space="preserve">
<value>Spanish (Español)</value>
</data>
<data name="MenuAppearanceLanguageJapanese" xml:space="preserve">
<value>Japanese (日本語)</value>
</data>
</root>
3 changes: 3 additions & 0 deletions MediaExtractor/Properties/Resources.es-ES.resx
Original file line number Diff line number Diff line change
Expand Up @@ -459,4 +459,7 @@
<data name="MenuAppearanceLanguageSpanish" xml:space="preserve">
<value>Español</value>
</data>
<data name="MenuAppearanceLanguageJapanese" xml:space="preserve">
<value>Japonés (日本語)</value>
</data>
</root>
3 changes: 3 additions & 0 deletions MediaExtractor/Properties/Resources.fr-FR.resx
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@
<data name="MenuAppearanceLanguageGerman" xml:space="preserve">
<value>Allemand (Deutsch)</value>
</data>
<data name="MenuAppearanceLanguageJapanese" xml:space="preserve">
<value>Japonais (日本語)</value>
</data>
<data name="MenuAppearanceLanguageSpanish" xml:space="preserve">
<value>Espagnol (Español)</value>
</data>
Expand Down
Empty file.
Loading

0 comments on commit 8c7e2d6

Please sign in to comment.