From d042ca5723fc8612ed6bfc672909756290921f1c Mon Sep 17 00:00:00 2001
From: Lev Kotovskiy <kotovskiy@studio-aw.ru>
Date: Sat, 8 Mar 2025 01:09:20 +0300
Subject: [PATCH 1/3] added language settings

---
 FASTER/Models/BasicCfg.cs           | 14 +++++++++++++-
 FASTER/Views/Profile.xaml           |  3 ++-
 FASTERTests/Models/BasicCfgTests.cs |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/FASTER/Models/BasicCfg.cs b/FASTER/Models/BasicCfg.cs
index fa3cf7f..ace35dc 100644
--- a/FASTER/Models/BasicCfg.cs
+++ b/FASTER/Models/BasicCfg.cs
@@ -14,6 +14,8 @@ public static class BasicCfgArrays
     [Serializable]
     public class BasicCfg : INotifyPropertyChanged
     {
+        private string language     = "English";
+        
         private uint   viewDistance = 2000;
         private double terrainGrid  = 25;
 
@@ -39,6 +41,16 @@ public string BasicContent
             }
         }
 
+        public string Language
+        {
+            get => language;
+            set
+            {
+                language = value;
+                RaisePropertyChanged("Language");
+            }
+        }
+        
         public uint ViewDistance
         {
             get => viewDistance;
@@ -191,7 +203,7 @@ public BasicCfg()
         public string ProcessFile()
         {
             string output = "// These options are created by default\r\n"
-                          + "language=\"English\";\r\n"
+                          + $"language=\"{language}\";\r\n"
                           + "adapter=-1;\r\n"
                           + "3D_Performance=1.000000;\r\n"
                           + "Resolution_W=800;\r\n"
diff --git a/FASTER/Views/Profile.xaml b/FASTER/Views/Profile.xaml
index b5add5f..ea8c5e9 100644
--- a/FASTER/Views/Profile.xaml
+++ b/FASTER/Views/Profile.xaml
@@ -58,6 +58,7 @@
                                     <Button Content="{iconPacks:Material Kind=FolderOpen}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Column="1" Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}" Height="auto" Margin="5,5,0,5" Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0" Padding="3" Click="SelectServerFile"/>
                                 </Grid>
                                 <mah:NumericUpDown Value="{Binding Profile.Port, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.UseFloatingWatermark="True" mah:TextBoxHelper.Watermark="Port" ToolTip="Port for ArmaServer"/>
+                                <TextBox Text="{Binding Path=Profile.BasicCfg.Language, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="Server Language" mah:TextBoxHelper.UseFloatingWatermark="True" />
                             </StackPanel>
                         </GroupBox>
                         <StackPanel Height="10"/>
@@ -666,7 +667,7 @@
                                         <mah:NumericUpDown Value="{Binding Path=Profile.ServerCfg.SteamProtocolMaxDataSize}" mah:TextBoxHelper.UseFloatingWatermark="True" mah:TextBoxHelper.Watermark="Steam Protocol Max Data Size" Margin="5"/>
 
                                         <TextBox MinHeight="50" Margin="5" Text="{Binding Path=Profile.ServerCfg.Admins}" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" mah:TextBoxHelper.UseFloatingWatermark="True" mah:TextBoxHelper.Watermark="Admins IDs (one per line)"/>
-
+                                        
                                     </StackPanel>
                                 </Expander>
                             </StackPanel>
diff --git a/FASTERTests/Models/BasicCfgTests.cs b/FASTERTests/Models/BasicCfgTests.cs
index f11b364..0ba08d7 100644
--- a/FASTERTests/Models/BasicCfgTests.cs
+++ b/FASTERTests/Models/BasicCfgTests.cs
@@ -30,6 +30,7 @@ public void BasicCfgGetTest()
             Assert.That(_cfg.PerfPreset, Is.EqualTo("Custom"));
             Assert.That(_cfg.TerrainGrid, Is.Not.Null);
             Assert.That(_cfg.ViewDistance, Is.Not.Null);
+            Assert.That(_cfg.Language, Is.Not.Null);
         }
 
         [Test()]

From 5f69354e0901a7f4ccb9b7438ce0524316df49db Mon Sep 17 00:00:00 2001
From: Lev Kotovskiy <kotovskiy@studio-aw.ru>
Date: Sat, 8 Mar 2025 01:29:45 +0300
Subject: [PATCH 2/3] margin

---
 FASTER/Views/Profile.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FASTER/Views/Profile.xaml b/FASTER/Views/Profile.xaml
index ea8c5e9..8dbd55a 100644
--- a/FASTER/Views/Profile.xaml
+++ b/FASTER/Views/Profile.xaml
@@ -58,7 +58,7 @@
                                     <Button Content="{iconPacks:Material Kind=FolderOpen}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Column="1" Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}" Height="auto" Margin="5,5,0,5" Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0" Padding="3" Click="SelectServerFile"/>
                                 </Grid>
                                 <mah:NumericUpDown Value="{Binding Profile.Port, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.UseFloatingWatermark="True" mah:TextBoxHelper.Watermark="Port" ToolTip="Port for ArmaServer"/>
-                                <TextBox Text="{Binding Path=Profile.BasicCfg.Language, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="Server Language" mah:TextBoxHelper.UseFloatingWatermark="True" />
+                                <TextBox Text="{Binding Path=Profile.BasicCfg.Language, UpdateSourceTrigger=PropertyChanged}" Margin="0 5" mah:TextBoxHelper.Watermark="Server Language" mah:TextBoxHelper.UseFloatingWatermark="True" />
                             </StackPanel>
                         </GroupBox>
                         <StackPanel Height="10"/>

From 78850684b4facfc0b4a1db5d6d230fadd62310d7 Mon Sep 17 00:00:00 2001
From: Lev Kotovskiy <kotovskiy@studio-aw.ru>
Date: Sat, 8 Mar 2025 01:51:23 +0300
Subject: [PATCH 3/3] Arma language settings should be located in the
 environment user profile in Arma3.cfg

---
 FASTER/Models/BasicCfg.cs            | 32 +++++++++++++++++++++++++---
 FASTER/Models/ServerProfile.cs       |  9 +++++---
 FASTER/ViewModel/ProfileViewModel.cs |  3 +++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/FASTER/Models/BasicCfg.cs b/FASTER/Models/BasicCfg.cs
index ace35dc..9af2bdb 100644
--- a/FASTER/Models/BasicCfg.cs
+++ b/FASTER/Models/BasicCfg.cs
@@ -30,6 +30,7 @@ public class BasicCfg : INotifyPropertyChanged
         private ushort maxPacketSize        = 1400;
 
         private string basicContent;
+        private string a3cfgContent;
 
         public string BasicContent
         {
@@ -40,6 +41,16 @@ public string BasicContent
                 RaisePropertyChanged("BasicContent");
             }
         }
+        
+        public string Arma3CfgContent
+        {
+            get => a3cfgContent;
+            set
+            {
+                a3cfgContent = value;
+                RaisePropertyChanged("Arma3CfgContent");
+            }
+        }
 
         public string Language
         {
@@ -198,9 +209,12 @@ public string PerfPreset
         }
 
         public BasicCfg()
-        { BasicContent = ProcessFile(); }
+        { 
+            BasicContent = ProcessBasicFile();
+            Arma3CfgContent = ProcessArma3CfgFile();
+        }
 
-        public string ProcessFile()
+        public string ProcessBasicFile()
         {
             string output = "// These options are created by default\r\n"
                           + $"language=\"{language}\";\r\n"
@@ -229,6 +243,14 @@ public string ProcessFile()
                           + $"class sockets{{ maxPacketSize = {maxPacketSize};}};";
             return output;
         }
+        
+        public string ProcessArma3CfgFile()
+        {
+            string output = "steamLanguage=\"\";\r\n"
+                    + $"language=\"{language}\";\r\n";
+
+            return output;
+        }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -236,7 +258,11 @@ private void RaisePropertyChanged(string property)
         {
             if (PropertyChanged == null) return;
             PropertyChanged(this, new PropertyChangedEventArgs(property));
-            if (property != "BasicContent") BasicContent = ProcessFile();
+            if (property != "BasicContent" && property != "Arma3CfgContent")
+            {
+                BasicContent = ProcessBasicFile();
+                Arma3CfgContent = ProcessArma3CfgFile();
+            }
         }
     }
 }
diff --git a/FASTER/Models/ServerProfile.cs b/FASTER/Models/ServerProfile.cs
index c9015a4..e4dacd4 100644
--- a/FASTER/Models/ServerProfile.cs
+++ b/FASTER/Models/ServerProfile.cs
@@ -25,7 +25,8 @@ internal static void AddServerProfile(string profileName)
             var currentProfiles = Properties.Settings.Default.Profiles;
             var p = new ServerProfile(profileName);
             p.ServerCfg.ServerCfgContent     = p.ServerCfg.ProcessFile();
-            p.BasicCfg.BasicContent          = p.BasicCfg.ProcessFile();
+            p.BasicCfg.BasicContent          = p.BasicCfg.ProcessBasicFile();
+            p.BasicCfg.Arma3CfgContent       = p.BasicCfg.ProcessArma3CfgFile();
             p.ArmaProfile.ArmaProfileContent = p.ArmaProfile.ProcessFile();
             currentProfiles.Add(p);
             Properties.Settings.Default.Profiles = currentProfiles;
@@ -428,7 +429,8 @@ public ServerProfile(string name, bool createFolder = true)
             BasicCfg = new BasicCfg();
             ServerCfg.ServerCfgContent = ServerCfg.ProcessFile();
             ArmaProfile.ArmaProfileContent = ArmaProfile.ProcessFile();
-            BasicCfg.BasicContent = BasicCfg.ProcessFile();
+            BasicCfg.BasicContent = BasicCfg.ProcessBasicFile();
+            BasicCfg.Arma3CfgContent = BasicCfg.ProcessArma3CfgFile();
 
             if (createFolder)
             { Directory.CreateDirectory(Path.Combine(Properties.Settings.Default.serverPath, "Servers", Id)); }
@@ -443,7 +445,8 @@ public ServerProfile()
             BasicCfg    = new BasicCfg();
             ServerCfg.ServerCfgContent = ServerCfg.ProcessFile();
             ArmaProfile.ArmaProfileContent = ArmaProfile.ProcessFile();
-            BasicCfg.BasicContent = BasicCfg.ProcessFile();
+            BasicCfg.BasicContent = BasicCfg.ProcessBasicFile();
+            BasicCfg.Arma3CfgContent = BasicCfg.ProcessArma3CfgFile();
         }
 
         public void GenerateNewId()
diff --git a/FASTER/ViewModel/ProfileViewModel.cs b/FASTER/ViewModel/ProfileViewModel.cs
index b9b6f71..c049827 100644
--- a/FASTER/ViewModel/ProfileViewModel.cs
+++ b/FASTER/ViewModel/ProfileViewModel.cs
@@ -212,9 +212,11 @@ internal void SaveProfile()
             string config        = Path.Combine(Profile.ArmaPath, "Servers", Profile.Id, "server_config.cfg");
             string basic         = Path.Combine(Profile.ArmaPath, "Servers", Profile.Id, "server_basic.cfg");
             string serverProfile = Path.Combine(Profile.ArmaPath, "Servers", Profile.Id, "users", Profile.Id, $"{Profile.Id}.Arma3Profile");
+            string arma3Cfg      = Path.Combine(Profile.ArmaPath, "Servers", Profile.Id, "users", Environment.UserName, $"Arma3.cfg"); 
 
             //Creating profile directory
             Directory.CreateDirectory(Path.Combine(Profile.ArmaPath, "Servers", Profile.Id, "users", Profile.Id));
+            Directory.CreateDirectory(Path.Combine(Profile.ArmaPath, "Servers", Profile.Id, "users", Environment.UserName));
 
             //Writing files
             try
@@ -222,6 +224,7 @@ internal void SaveProfile()
                 File.WriteAllLines(config,        Profile.ServerCfg.ServerCfgContent.Replace("\r", "").Split('\n'));
                 File.WriteAllLines(basic,         Profile.BasicCfg.BasicContent.Replace("\r", "").Split('\n'));
                 File.WriteAllLines(serverProfile, Profile.ArmaProfile.ArmaProfileContent.Replace("\r", "").Split('\n'));
+                File.WriteAllLines(arma3Cfg,      Profile.BasicCfg.Arma3CfgContent.Replace("\r", "").Split('\n'));
             }
             catch
             { DisplayMessage("Could not write the config files. Please ensure the server is not running and retry."); }