Skip to content

Commit eb8d4a6

Browse files
CodeDeadCodeDead
committed
* Added all added translations to the project
* Refactoring * Fixed some french translation issues (formatting)
1 parent d28fd5f commit eb8d4a6

20 files changed

+125
-91
lines changed

‎MemPlus/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<value>False</value>
122122
</setting>
123123
<setting name="SelectedLanguage" serializeAs="String">
124-
<value>0</value>
124+
<value>1</value>
125125
</setting>
126126
</MemPlus.Properties.Settings>
127127
</userSettings>

‎MemPlus/Business/GUI/GuiManager.cs‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
using System;
2+
using System.Windows;
3+
using System.Windows.Media;
4+
using MemPlus.Business.LOG;
5+
using Syncfusion.Windows.Shared;
6+
7+
namespace MemPlus.Business.GUI
8+
{
9+
/// <summary>
10+
/// Static class to change the style of an object
11+
/// </summary>
12+
internal static class GuiManager
13+
{
14+
/// <summary>
15+
/// Change the visual style of an object
16+
/// </summary>
17+
/// <param name="o">The object that needs to have a style overhaul</param>
18+
internal static void ChangeStyle(DependencyObject o)
19+
{
20+
try
21+
{
22+
SkinStorage.SetVisualStyle(o, Properties.Settings.Default.VisualStyle);
23+
SkinStorage.SetMetroBrush(o, new SolidColorBrush(Properties.Settings.Default.MetroColor));
24+
if (!(o is ChromelessWindow window)) return;
25+
window.BorderThickness = new Thickness(Properties.Settings.Default.BorderThickness);
26+
window.CornerRadius = new CornerRadius(0, 0, 0, 0);
27+
window.Opacity = Properties.Settings.Default.WindowOpacity;
28+
window.ResizeBorderThickness = new Thickness(Properties.Settings.Default.WindowResizeBorder);
29+
}
30+
catch (Exception ex)
31+
{
32+
SkinStorage.SetVisualStyle(o, "Metro");
33+
MessageBox.Show(ex.Message, "MemPlus", MessageBoxButton.OK, MessageBoxImage.Error);
34+
}
35+
}
36+
37+
/// <summary>
38+
/// Change the language of the application, depending on the settings
39+
/// </summary>
40+
/// <param name="logController">The LogController object that can be used to add logs</param>
41+
internal static void ChangeLanguage(LogController logController)
42+
{
43+
logController.AddLog(new ApplicationLog("Changing language"));
44+
ResourceDictionary dict = new ResourceDictionary();
45+
Uri langUri;
46+
try
47+
{
48+
switch (Properties.Settings.Default.SelectedLanguage)
49+
{
50+
default:
51+
langUri = new Uri("..\\Resources\\Languages\\en_US.xaml", UriKind.Relative);
52+
break;
53+
case 0:
54+
langUri = new Uri("..\\Resources\\Languages\\de_DE.xaml", UriKind.Relative);
55+
break;
56+
case 2:
57+
langUri = new Uri("..\\Resources\\Languages\\es_ES.xaml", UriKind.Relative);
58+
break;
59+
case 3:
60+
langUri = new Uri("..\\Resources\\Languages\\fr_FR.xaml", UriKind.Relative);
61+
break;
62+
case 4:
63+
langUri = new Uri("..\\Resources\\Languages\\gl_ES.xaml", UriKind.Relative);
64+
break;
65+
case 5:
66+
langUri = new Uri("..\\Resources\\Languages\\nl_BE.xaml", UriKind.Relative);
67+
break;
68+
case 6:
69+
langUri = new Uri("..\\Resources\\Languages\\nl_NL.xaml", UriKind.Relative);
70+
break;
71+
}
72+
}
73+
catch (Exception ex)
74+
{
75+
langUri = new Uri("..\\Resources\\Languages\\en.xaml", UriKind.Relative);
76+
logController.AddLog(new ApplicationLog(ex.Message));
77+
MessageBox.Show(ex.Message, "MemPlus", MessageBoxButton.OK, MessageBoxImage.Error);
78+
}
79+
80+
dict.Source = langUri;
81+
Application.Current.Resources.MergedDictionaries.Clear();
82+
Application.Current.Resources.MergedDictionaries.Add(dict);
83+
84+
logController.AddLog(new ApplicationLog("Done changing language"));
85+
}
86+
}
87+
}

‎MemPlus/Business/GUI/StyleManager.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎MemPlus/MemPlus.csproj‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105
<Compile Include="Views\Windows\SettingsWindow.xaml.cs">
106106
<DependentUpon>SettingsWindow.xaml</DependentUpon>
107107
</Compile>
108+
<Page Include="Resources\Languages\de_DE.xaml">
109+
<Generator>MSBuild:Compile</Generator>
110+
<SubType>Designer</SubType>
111+
</Page>
108112
<Page Include="Resources\Languages\en_US.xaml">
109113
<SubType>Designer</SubType>
110114
<Generator>MSBuild:Compile</Generator>
@@ -113,6 +117,10 @@
113117
<SubType>Designer</SubType>
114118
<Generator>MSBuild:Compile</Generator>
115119
</Page>
120+
<Page Include="Resources\Languages\fr_FR.xaml">
121+
<Generator>MSBuild:Compile</Generator>
122+
<SubType>Designer</SubType>
123+
</Page>
116124
<Page Include="Resources\Languages\gl_ES.xaml">
117125
<SubType>Designer</SubType>
118126
<Generator>MSBuild:Compile</Generator>
@@ -121,6 +129,10 @@
121129
<SubType>Designer</SubType>
122130
<Generator>MSBuild:Compile</Generator>
123131
</Page>
132+
<Page Include="Resources\Languages\nl_NL.xaml">
133+
<Generator>MSBuild:Compile</Generator>
134+
<SubType>Designer</SubType>
135+
</Page>
124136
<Page Include="Views\Windows\AboutWindow.xaml">
125137
<SubType>Designer</SubType>
126138
<Generator>MSBuild:Compile</Generator>
@@ -148,7 +160,7 @@
148160
<Compile Include="Business\LOG\RamLog.cs" />
149161
<Compile Include="Business\RAM\RamController.cs" />
150162
<Compile Include="Business\RAM\RamOptimizer.cs" />
151-
<Compile Include="Business\GUI\StyleManager.cs" />
163+
<Compile Include="Business\GUI\GuiManager.cs" />
152164
<Compile Include="Views\Windows\AboutWindow.xaml.cs">
153165
<DependentUpon>AboutWindow.xaml</DependentUpon>
154166
</Compile>

‎MemPlus/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MemPlus/Properties/Settings.settings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<Value Profile="(Default)">False</Value>
116116
</Setting>
117117
<Setting Name="SelectedLanguage" Type="System.Int32" Scope="User">
118-
<Value Profile="(Default)">0</Value>
118+
<Value Profile="(Default)">1</Value>
119119
</Setting>
120120
</Settings>
121121
</SettingsFile>

‎MemPlus/Resources/Languages/de_DE.xaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<system:String x:Key="RunningLatestVersion">Du hast die neuste Version!</system:String>
1616
<system:String x:Key="UpdateNow">Möchtest du die Bewerbung jetzt aktualisieren?</system:String>
1717

18-
1918
<!--Menu-->
2019
<system:String x:Key="File">_Datei</system:String>
2120
<system:String x:Key="Export">Exportieren</system:String>
@@ -126,4 +125,4 @@
126125
<system:String x:Key="FileDoesNotExist">Die ausgewählte Datei existiert nicht!</system:String>
127126
<system:String x:Key="AutoOptimizeWarning">Diese Option funktioniert nur wenn der RAM Überwacher aktiviert ist!</system:String>
128127

129-
</ResourceDictionary>
128+
</ResourceDictionary>

‎MemPlus/Resources/Languages/en_US.xaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<system:String x:Key="RunningLatestVersion">You are running the latest version!</system:String>
1616
<system:String x:Key="UpdateNow">Would you like to update the application now?</system:String>
1717

18-
1918
<!--Menu-->
2019
<system:String x:Key="File">_File</system:String>
2120
<system:String x:Key="Export">Export</system:String>
@@ -127,4 +126,3 @@
127126
<system:String x:Key="AutoOptimizeWarning">This option will only work if the RAM Monitor is enabled!</system:String>
128127

129128
</ResourceDictionary>
130-

‎MemPlus/Resources/Languages/es_ES.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<system:String x:Key="RunningLatestVersion">¡Estás ejecutando la última versión!</system:String>
1616
<system:String x:Key="UpdateNow">¿Quieres actualizar la aplicación ahora?</system:String>
1717

18-
1918
<!--Menu-->
2019
<system:String x:Key="File">_Archivo</system:String>
2120
<system:String x:Key="Export">Exportar</system:String>

‎MemPlus/Resources/Languages/fr_FR.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<system:String x:Key="About">A propos</system:String>
4646

4747
<!--MainWindow-->
48-
<system:String x:Key="TotalPhysicalMemory">Mémoire physique totale:system:String>
49-
<system:String x:Key="UsedPhysicalMemory">Mémoire physique utilisée:system:String>
48+
<system:String x:Key="TotalPhysicalMemory">Mémoire physique totale:</system:String>
49+
<system:String x:Key="UsedPhysicalMemory">Mémoire physique utilisée:</system:String>
5050
<system:String x:Key="ClearWorkingSets">Effacer les ensembles de travail</system:String>
5151
<system:String x:Key="ClearFileSystemCache">Effacer le cache des fichiers systèmes</system:String>
5252
<system:String x:Key="AdministrativeRightsWarning">MemPlus peut ne pas fonctionner correctement sans droits d'administration!</system:String>
@@ -57,7 +57,7 @@
5757
<!--AboutWindow-->
5858
<system:String x:Key="AboutWindowTitle">MemPlus - À propos</system:String>
5959
<system:String x:Key="Close">Fermer</system:String>
60-
<system:String x:Key="AboutInfo">MemPlus a été créé par DeadLine. \ N \ nImages: petit-n-plat par paomedia \ nThème: Syncfusion \ nVersion:% \ n \ nCopyright © CodeDead 2018</system:String>
60+
<system:String x:Key="AboutInfo">MemPlus a été créé par DeadLine.\n\nImages: petit-n-plat par paomedia\nThème: Syncfusion\nVersion:%\n\nCopyright © CodeDead 2018</system:String>
6161

6262
<!--LogWindow-->
6363
<system:String x:Key="LogWindowTitle">MemPlus - Journaux</system:String>
@@ -88,7 +88,7 @@
8888
<system:String x:Key="AutoStartMemPlus">Démarrer MemPlus lorsque Windows démarre</system:String>
8989
<system:String x:Key="StartMinimized">Démarrer MemPlus minimisé</system:String>
9090
<system:String x:Key="HideOnStart">Masquer MemPlus au démarrage</system:String>
91-
<system:String x:Key="HideInsteadOfClose"> Masquer MemPlus au lieu de le fermer</system:String>
91+
<system:String x:Key="HideInsteadOfClose">Masquer MemPlus au lieu de le fermer</system:String>
9292
<system:String x:Key="AutoRunAsAdministrator">Exécuter automatiquement en tant qu'administrateur</system:String>
9393
<system:String x:Key="Topmost">Le plus haut</system:String>
9494
<system:String x:Key="DisplayNotifyIcon">Afficher l'icone de notification</system:String>

0 commit comments

Comments
 (0)