From aa4c7be8135704d25dd9cca1166bb09a6b7a0f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enner=20P=C3=A9rez?= <ennerperez@gmail.com>
Date: Sun, 17 Mar 2024 22:34:24 -0500
Subject: [PATCH] Resx Folder Location

---
 src/App.axaml.cs                                          | 6 +++---
 .../Locales.Designer.cs}                                  | 8 ++++----
 .../Resources.en.resx => Resources/Locales.en.resx}       | 0
 src/{Assets/Resources.resx => Resources/Locales.resx}     | 0
 .../Resources.zh.resx => Resources/Locales.zh.resx}       | 0
 src/SourceGit.csproj                                      | 8 ++++++--
 6 files changed, 13 insertions(+), 9 deletions(-)
 rename src/{Assets/Resources.Designer.cs => Resources/Locales.Designer.cs} (99%)
 rename src/{Assets/Resources.en.resx => Resources/Locales.en.resx} (100%)
 rename src/{Assets/Resources.resx => Resources/Locales.resx} (100%)
 rename src/{Assets/Resources.zh.resx => Resources/Locales.zh.resx} (100%)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 36c29f64..74443fab 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -93,11 +93,11 @@ namespace SourceGit
 
             Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(localeKey);
             Thread.CurrentThread.CurrentCulture  = Thread.CurrentThread.CurrentUICulture ;
-            Assets.Resources.Culture = Thread.CurrentThread.CurrentUICulture;
+            SourceGit.Resources.Locales.Culture = Thread.CurrentThread.CurrentUICulture;
             
             var locale = new ResourceDictionary();
-            var res = new Assets.Resources();
-            var props = typeof(Assets.Resources).GetProperties()
+            var res = new Resources.Locales();
+            var props = typeof(Resources.Locales).GetProperties()
                 .Where(m=> m.PropertyType == typeof(string))
                 .ToDictionary(k=> k.Name.Replace("_", "."), v=> v.GetValue(res));
             foreach (var prop in props)
diff --git a/src/Assets/Resources.Designer.cs b/src/Resources/Locales.Designer.cs
similarity index 99%
rename from src/Assets/Resources.Designer.cs
rename to src/Resources/Locales.Designer.cs
index a1a839e2..1094816f 100644
--- a/src/Assets/Resources.Designer.cs
+++ b/src/Resources/Locales.Designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SourceGit.Assets {
+namespace SourceGit.Resources {
     using System;
     
     
@@ -21,14 +21,14 @@ namespace SourceGit.Assets {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
+    public class Locales {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public Resources() {
+        public Locales() {
         }
         
         /// <summary>
@@ -38,7 +38,7 @@ namespace SourceGit.Assets {
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SourceGit.Assets.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SourceGit.Resources.Locales", typeof(Locales).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/Assets/Resources.en.resx b/src/Resources/Locales.en.resx
similarity index 100%
rename from src/Assets/Resources.en.resx
rename to src/Resources/Locales.en.resx
diff --git a/src/Assets/Resources.resx b/src/Resources/Locales.resx
similarity index 100%
rename from src/Assets/Resources.resx
rename to src/Resources/Locales.resx
diff --git a/src/Assets/Resources.zh.resx b/src/Resources/Locales.zh.resx
similarity index 100%
rename from src/Assets/Resources.zh.resx
rename to src/Resources/Locales.zh.resx
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 852365b6..b26d5049 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -48,9 +48,13 @@
   </ItemGroup>
   
   <ItemGroup>
-    <EmbeddedResource Update="Assets\Resources.*.resx">
+    <EmbeddedResource Update="Resources\Locales.*.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <DependentUpon>Resources.resx</DependentUpon>
+      <DependentUpon>Locales.resx</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Locales.*.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <DependentUpon>Locales.resx</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>