From 2e7579cac5b4a28544896ec415067f87916fc2c2 Mon Sep 17 00:00:00 2001
From: Dimitrij <kvarkas@gmail.com>
Date: Fri, 18 Oct 2024 15:40:50 +0100
Subject: [PATCH] Moved all language files into Language folder. To keep root
 folder clean

On language change new language will not apply, need more work on that later
---
 mRemoteNG/App.config                    |  2 +-
 mRemoteNG/App/ProgramRoot.cs            |  1 +
 mRemoteNG/Language/Language.Designer.cs |  3 +++
 mRemoteNG/mRemoteNG.csproj              | 20 +++++++++++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/mRemoteNG/App.config b/mRemoteNG/App.config
index f326b769..1da402e1 100644
--- a/mRemoteNG/App.config
+++ b/mRemoteNG/App.config
@@ -5,7 +5,7 @@
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="Assemblies"/>
+      <probing privatePath="Languages"/>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/mRemoteNG/App/ProgramRoot.cs b/mRemoteNG/App/ProgramRoot.cs
index c6410494..1a2b2212 100644
--- a/mRemoteNG/App/ProgramRoot.cs
+++ b/mRemoteNG/App/ProgramRoot.cs
@@ -16,6 +16,7 @@ namespace mRemoteNG.App
     {
         private static Mutex _mutex;
         private static FrmSplashScreenNew _frmSplashScreen = null;
+        private static string customResourcePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Languages");
 
         /// <summary>
         /// The main entry point for the application.
diff --git a/mRemoteNG/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs
index 062d57ad..6843981a 100644
--- a/mRemoteNG/Language/Language.Designer.cs
+++ b/mRemoteNG/Language/Language.Designer.cs
@@ -39,6 +39,9 @@ namespace mRemoteNG.Resources.Language {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
+                    //string resourceFilePath = "Languages/ru/mRemoteNG.resources.dll";
+                    //global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager(resourceFilePath, typeof(Language).Assembly);
+
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Language.Language", typeof(Language).Assembly);
                     resourceMan = temp;
                 }
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index acaf144b..e9054d8b 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -538,9 +538,27 @@
     <Delete Files="@(Assemblies)" /> 
   </Target>  
   -->
+  <!--<ItemGroup>
+  
+    <None Update="**\*.resources.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>Languages\%(Culture)\%(Filename)%(Extension)</TargetPath>
+    </None>
+  </ItemGroup>
+  -->
+  <Target Name="MoveSatelliteResources" AfterTargets="Build">
+    <ItemGroup>
+      <SatelliteResources Include="$(OutputPath)**\*.resources.dll" />
+    </ItemGroup>
+
+    <!-- Создаем папку Languages, если она еще не существует -->
+    <MakeDir Directories="$(OutputPath)Languages" />
+    <Move SourceFiles="@(SatelliteResources)" DestinationFolder="$(OutputPath)Languages\%(RecursiveDir)" />
+    <RemoveDir Directories="@(SatelliteResources->'%(RootDir)%(Directory)')" Condition="Exists('%(RootDir)%(Directory)')" />
+  </Target>
   <Target Name="CopyPackageAssembliesToSubFolder" AfterTargets="ResolveReferences">
     <ItemGroup>
       <ReferenceCopyLocalPaths Condition=" '%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' " Update="%(ReferenceCopyLocalPaths)" DestinationSubDirectory="Assemblies\" />
     </ItemGroup>
-</Target>
+  </Target>
 </Project>
\ No newline at end of file