From 2ea9e945abe68ee37746b404e066f6a8bd0bf947 Mon Sep 17 00:00:00 2001
From: GreemDev <greem@greemdev.net>
Date: Sun, 30 Mar 2025 02:06:04 -0500
Subject: [PATCH] Move locales.json to repository root under "assets" folder

See merge request ryubing/ryujinx!20
---
 {src/Ryujinx/Assets => assets}/locales.json               | 0
 src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs | 2 +-
 src/Ryujinx/Common/LocaleManager.cs                       | 2 +-
 src/Ryujinx/Ryujinx.csproj                                | 6 ++++--
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename {src/Ryujinx/Assets => assets}/locales.json (100%)

diff --git a/src/Ryujinx/Assets/locales.json b/assets/locales.json
similarity index 100%
rename from src/Ryujinx/Assets/locales.json
rename to assets/locales.json
diff --git a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
index b8e14cd30..bc2131035 100644
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -15,7 +15,7 @@ namespace Ryujinx.BuildValidationTasks
         {
             Console.WriteLine("Running Locale Validation Task...");
 
-            string path = projectPath + "src/Ryujinx/Assets/locales.json";
+            string path = projectPath + "assets/locales.json";
             string data;
 
             using (StreamReader sr = new(path))
diff --git a/src/Ryujinx/Common/LocaleManager.cs b/src/Ryujinx/Common/LocaleManager.cs
index 9307532e7..e6648fd7e 100644
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -154,7 +154,7 @@ namespace Ryujinx.Ava.Common.Locale
         {
             Dictionary<LocaleKeys, string> localeStrings = new();
 
-            _localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/locales.json")
+            _localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/Locale.json")
                 .Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson));
 
             foreach (LocalesEntry locale in _localeData.Value.Locales)
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index db97c9b68..afd09a4d5 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -154,7 +154,9 @@
     <EmbeddedResource Include="..\..\docs\compatibility.csv" LogicalName="RyujinxGameCompatibilityList">
       <Link>Assets\RyujinxGameCompatibility.csv</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="Assets\locales.json" />
+    <EmbeddedResource Include="..\..\assets\locales.json">
+      <Link>Assets\Locale.json</Link>
+    </EmbeddedResource>
     <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConPair.svg" />
@@ -173,6 +175,6 @@
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="Assets\locales.json" />
+    <AdditionalFiles Include="..\..\assets\locales.json" />
   </ItemGroup>
 </Project>
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index e47adc575..5534ab8e7 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -76,7 +76,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
         private static IEnumerable<MenuItem> GenerateLanguageMenuItems()
         {
-            const string LocalePath = "Ryujinx/Assets/locales.json";
+            const string LocalePath = "Ryujinx/Assets/Locale.json";
 
             string languageJson = EmbeddedResources.ReadAllText(LocalePath);