Merge pull request #36 from arthurits/version-1.5

ErgoLux 1.5

CHANGELOG.md

@@ -1,10 +1,11 @@
 # ErgoLux changelog
 
 ## ErgoLux 1.5
-* Add Turkish (tr-TR) translation. _Thanks barisceliker1_.
+* Add Turkish (tr-TR) translation. _Thanks @barisceliker1_.
 * [ScottPlot](https://github.com/ScottPlot/ScottPlot) control has been updated to version 4.1.63.
 * Improve controls placement in Settings for all available languages.
 * Fix code when closing the application.
+* Fix bug: culture in StringResources is not reset after cancelling dialog.
 * Refactor references to the resource file.
 
 ## ErgoLux 1.4

ErgoLux/ErgoLux.csproj

@@ -19,7 +19,7 @@ If you find this software useful, please consider supporting it!</Description>
     <RepositoryUrl>https://github.com/arthurits/ErgoLux</RepositoryUrl>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.4</Version>
+    <Version>1.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

ErgoLux/FrmLanguage.cs

@@ -31,6 +31,11 @@ private void Accept_Click(object sender, EventArgs e)
 
     private void Cancel_Click(object sender, EventArgs e)
     {
+        if (Settings is not null)
+            StringResources.Culture = Settings.AppCulture;
+        else
+            StringResources.Culture = CultureInfo.InvariantCulture;
+
         DialogResult = DialogResult.Cancel;
     }
 

ErgoLux/FrmSettings.cs

@@ -1,5 +1,6 @@
 using FTD2XX_NET;
 using System.Globalization;
+using System.Text.RegularExpressions;
 
 namespace ErgoLux;
 
@@ -318,6 +319,11 @@ private void Reset_Click(object sender, EventArgs e)
 
     private void Cancel_Click(object sender, EventArgs e)
     {
+        if (Settings is not null)
+            StringResources.Culture = Settings.AppCulture;
+        else
+            StringResources.Culture = CultureInfo.InvariantCulture;
+
         DialogResult = DialogResult.Cancel;
     }