crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-04-25 08:47:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch ryujinx:master into master_skipUserPrMg

Browse source
This commit is contained in:
Goodfeat 2025-03-30 02:32:22 -05:00
commit c81a775a1d
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/Ryujinx/Assets/locales.json → assets/locales.json
View file

2
src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
View file

@ -15,7 +15,7 @@ namespace Ryujinx.BuildValidationTasks
{ {
Console.WriteLine("Running Locale Validation Task..."); Console.WriteLine("Running Locale Validation Task...");
string path = projectPath + "src/Ryujinx/Assets/locales.json"; string path = projectPath + "assets/locales.json";
string data; string data;
using (StreamReader sr = new(path)) using (StreamReader sr = new(path))

2
src/Ryujinx/Common/LocaleManager.cs
View file

@ -154,7 +154,7 @@ namespace Ryujinx.Ava.Common.Locale
{ {
Dictionary<LocaleKeys, string> localeStrings = new(); 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)); .Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson));
foreach (LocalesEntry locale in _localeData.Value.Locales) foreach (LocalesEntry locale in _localeData.Value.Locales)

6
src/Ryujinx/Ryujinx.csproj
View file

@ -154,7 +154,9 @@
<EmbeddedResource Include="..\..\docs\compatibility.csv" LogicalName="RyujinxGameCompatibilityList"> <EmbeddedResource Include="..\..\docs\compatibility.csv" LogicalName="RyujinxGameCompatibilityList">
<Link>Assets\RyujinxGameCompatibility.csv</Link> <Link>Assets\RyujinxGameCompatibility.csv</Link>
</EmbeddedResource> </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\Styles\Styles.xaml" />
<EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" /> <EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" />
<EmbeddedResource Include="Assets\Icons\Controller_JoyConPair.svg" /> <EmbeddedResource Include="Assets\Icons\Controller_JoyConPair.svg" />
@ -173,6 +175,6 @@
<EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" /> <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="Assets\locales.json" /> <AdditionalFiles Include="..\..\assets\locales.json" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
View file

@ -76,7 +76,7 @@ namespace Ryujinx.Ava.UI.Views.Main
private static IEnumerable<MenuItem> GenerateLanguageMenuItems() private static IEnumerable<MenuItem> GenerateLanguageMenuItems()
{ {
const string LocalePath = "Ryujinx/Assets/locales.json"; const string LocalePath = "Ryujinx/Assets/Locale.json";
string languageJson = EmbeddedResources.ReadAllText(LocalePath); string languageJson = EmbeddedResources.ReadAllText(LocalePath);