Fix localization bug

See issue #7
valnoxy · Jul 23, 2023 · c9cf148 · c9cf148
1 parent 7f8f93d
commit c9cf148
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/GoAwayEdge/GoAwayEdge.csproj b/GoAwayEdge/GoAwayEdge.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
@@ -13,7 +13,7 @@
 		<AssemblyName>GoAwayEdge</AssemblyName>
 		<Company>Exploitox</Company>
 		<Authors>valnoxy</Authors>
-		<Version>1.1.0.38</Version>
+		<Version>1.1.1.42</Version>
 		<Copyright>Copyright (c) 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<PackageProjectUrl>https://github.com/valnoxy/GoAwayEdge</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/valnoxy/GoAwayEdge</RepositoryUrl>

diff --git a/GoAwayEdge/Installer.xaml b/GoAwayEdge/Installer.xaml
@@ -6,7 +6,7 @@
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:local="clr-namespace:GoAwayEdge"
         mc:Ignorable="d"
-        Title="{StaticResource Title}" MaxHeight="500" MaxWidth="800" 
+        Title="{DynamicResource Title}" MaxHeight="500" MaxWidth="800" 
         MinHeight="500" MinWidth="800" Height="500" Width="800"
         WindowStartupLocation="CenterScreen"
         ExtendsContentIntoTitleBar="True"
@@ -31,11 +31,11 @@
                 <Label Content="Version 1.2.0" VerticalContentAlignment="Bottom" x:Name="VersionLbl"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Content="{StaticResource Back}" Margin="0,0,5,0" Click="BackBtn_OnClick" x:Name="BackBtn" IsEnabled="false"/>
-                <Button Content="{StaticResource Next}" Margin="0,0,5,0" Click="NextBtn_OnClick" x:Name="NextBtn" IsEnabled="false"/>
+                <Button Content="{DynamicResource Back}" Margin="0,0,5,0" Click="BackBtn_OnClick" x:Name="BackBtn" IsEnabled="false"/>
+                <Button Content="{DynamicResource Next}" Margin="0,0,5,0" Click="NextBtn_OnClick" x:Name="NextBtn" IsEnabled="false"/>
             </StackPanel>
         </DockPanel>
 
-        <ui:TitleBar x:Name="Bar" Title="{StaticResource Title}" Grid.Row="0" ShowMaximize="false"/>
+        <ui:TitleBar x:Name="Bar" Title="{DynamicResource Title}" Grid.Row="0" ShowMaximize="false"/>
     </Grid>
 </ui:UiWindow>
diff --git a/GoAwayEdge/Pages/Installation.xaml b/GoAwayEdge/Pages/Installation.xaml
@@ -9,11 +9,11 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
         <ui:SymbolIcon Symbol="Apps24" FontSize="80" />
-        <Label Content="{StaticResource SetupProgressTitle}" 
+        <Label Content="{DynamicResource SetupProgressTitle}" 
                HorizontalAlignment="Center" 
                FontSize="30" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        <Label Content="{StaticResource SetupProgressDescription}" 
+        <Label Content="{DynamicResource SetupProgressDescription}" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                Margin="0,15,0,0"
                FontSize="14"

diff --git a/GoAwayEdge/Pages/InstallationSuccess.xaml b/GoAwayEdge/Pages/InstallationSuccess.xaml
@@ -9,15 +9,15 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
         <ui:SymbolIcon Symbol="CheckmarkCircle24" FontSize="80" />
-        <Label Content="{StaticResource SetupFinishedTitle}"
+        <Label Content="{DynamicResource SetupFinishedTitle}"
                HorizontalAlignment="Center" 
                FontSize="30" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        <Label Content="{StaticResource SetupFinishedDescription}" 
+        <Label Content="{DynamicResource SetupFinishedDescription}" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                Margin="0,15,0,0"
                FontSize="14"
                HorizontalAlignment="Center"/>
-        <ui:Hyperlink HorizontalAlignment="Center" NavigateUri="https://paypal.me/valnoxy" Content="{StaticResource DonateButton}"/>
+        <ui:Hyperlink HorizontalAlignment="Center" NavigateUri="https://paypal.me/valnoxy" Content="{DynamicResource DonateButton}"/>
     </StackPanel>
 </UserControl>
diff --git a/GoAwayEdge/Pages/License.xaml b/GoAwayEdge/Pages/License.xaml
@@ -9,16 +9,16 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Foreground="{DynamicResource TextFillColorPrimaryBrush}" Text="{StaticResource LicenseNote}"/>
+            <TextBlock Foreground="{DynamicResource TextFillColorPrimaryBrush}" Text="{DynamicResource LicenseNote}"/>
 
             <ui:Card Margin="0,10,0,10">
                 <ScrollViewer Height="240" Margin="0,-5,-10,0">
                     <TextBlock x:Name="LicenseBlock" />
                 </ScrollViewer>
             </ui:Card>
 
-            <RadioButton Content="{StaticResource LicenseAccept}" Click="AcceptLicenseRb_Click"/>
-            <RadioButton Content="{StaticResource LicenseDecline}" IsChecked="true" Click="DeclineLicenseRb_Click"/>
+            <RadioButton Content="{DynamicResource LicenseAccept}" Click="AcceptLicenseRb_Click"/>
+            <RadioButton Content="{DynamicResource LicenseDecline}" IsChecked="true" Click="DeclineLicenseRb_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/GoAwayEdge/Pages/Settings.xaml b/GoAwayEdge/Pages/Settings.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
-        <Label FontSize="20" Content="{StaticResource SettingsTitle}" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Label FontSize="20" Content="{DynamicResource SettingsTitle}" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
         <StackPanel Margin="0,5,0,0">
             <ui:CardControl Icon="Channel24">
                 <ui:CardControl.Header>
@@ -21,11 +21,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsEdgeChannelTitle}" />
+                                Text="{DynamicResource SettingsEdgeChannelTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsEdgeChannelDescription}" />
+                                Text="{DynamicResource SettingsEdgeChannelDescription}" />
                         </StackPanel>
                         <ComboBox Grid.Column="1" x:Name="EdgeChannelBox" Width="180" SelectionChanged="EdgeChannelBox_OnSelectionChanged"/>
                     </Grid>
@@ -45,11 +45,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsSearchEngineTitle}" />
+                                Text="{DynamicResource SettingsSearchEngineTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsSearchEngineDescription}" />
+                                Text="{DynamicResource SettingsSearchEngineDescription}" />
                         </StackPanel>
                         <ComboBox Grid.Column="1" x:Name="SearchEngineBox" Width="180" SelectionChanged="SearchEngineBox_OnSelectionChanged"/>
                     </Grid>
@@ -69,11 +69,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsCustomSearchEngineTitle}" />
+                                Text="{DynamicResource SettingsCustomSearchEngineTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsCustomSearchEngineDescription}"/>
+                                Text="{DynamicResource SettingsCustomSearchEngineDescription}"/>
                         </StackPanel>
                         <ui:TextBox Grid.Column="1" Width="300" x:Name="QueryUrlTextBox" TextChanged="QueryUrlTextBox_OnTextChanged" PlaceholderText="https://www.google.com/search?q="/>
                     </Grid>
@@ -93,11 +93,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsUninstallTitle}" />
+                                Text="{DynamicResource SettingsUninstallTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsUninstallDescription}" 
+                                Text="{DynamicResource SettingsUninstallDescription}" 
                                 x:Name="EdgeUninstallNote"/>
                         </StackPanel>
                         <ui:ToggleSwitch Grid.Column="1" x:Name="UninstallSwitch" Click="UninstallSwitch_OnClick"/>