Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 14:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved all language files into Language folder. To keep root folder clean

Browse Source 
On language change new language will not apply, need more work on that later
This commit is contained in:
Dimitrij
2024-10-18 15:40:50 +01:00
parent ec63812af0
commit 2e7579cac5
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mRemoteNG/App.config
View File

@@ -5,7 +5,7 @@
</appSettings> </appSettings>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Assemblies"/> <probing privatePath="Languages"/>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

1
mRemoteNG/App/ProgramRoot.cs
View File

@@ -16,6 +16,7 @@ namespace mRemoteNG.App
{ {
private static Mutex _mutex; private static Mutex _mutex;
private static FrmSplashScreenNew _frmSplashScreen = null; private static FrmSplashScreenNew _frmSplashScreen = null;
private static string customResourcePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Languages");
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.

3
mRemoteNG/Language/Language.Designer.cs generated
View File

@@ -39,6 +39,9 @@ namespace mRemoteNG.Resources.Language {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Language.Language", typeof(Language).Assembly);
resourceMan = temp; resourceMan = temp;
} }

20
mRemoteNG/mRemoteNG.csproj
View File

@@ -538,9 +538,27 @@
<Delete Files="@(Assemblies)" /> <Delete Files="@(Assemblies)" />
</Target> </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"> <Target Name="CopyPackageAssembliesToSubFolder" AfterTargets="ResolveReferences">
<ItemGroup> <ItemGroup>
<ReferenceCopyLocalPaths Condition=" '%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' " Update="%(ReferenceCopyLocalPaths)" DestinationSubDirectory="Assemblies\" /> <ReferenceCopyLocalPaths Condition=" '%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' " Update="%(ReferenceCopyLocalPaths)" DestinationSubDirectory="Assemblies\" />
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>