crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-05-12 14:37:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: crafterpika:c81a775a1d8cc7c4911b0a27f4010c257fa4c315
Branches Tags
crafterpika:master
crafterpika:update/dotnet/10
crafterpika:fix/handheld-always-ignored-in-headless
crafterpika:removal/ims
crafterpika:metal
crafterpika:Canary-1.3.39
crafterpika:Canary-1.3.38
crafterpika:Canary-1.3.37
crafterpika:Canary-1.3.36
crafterpika:Canary-1.3.35
crafterpika:1.3.1
crafterpika:Canary-1.3.34
crafterpika:Canary-1.3.33
crafterpika:Canary-1.3.32
crafterpika:Canary-1.3.31
crafterpika:Canary-1.3.30
..
compare: crafterpika:3719db2e4b9f2ec5e333a90c3d18ca3883134f70
Branches Tags
crafterpika:master
crafterpika:update/dotnet/10
crafterpika:fix/handheld-always-ignored-in-headless
crafterpika:removal/ims
crafterpika:metal
crafterpika:Canary-1.3.39
crafterpika:Canary-1.3.38
crafterpika:Canary-1.3.37
crafterpika:Canary-1.3.36
crafterpika:Canary-1.3.35
crafterpika:1.3.1
crafterpika:Canary-1.3.34
crafterpika:Canary-1.3.33
crafterpika:Canary-1.3.32
crafterpika:Canary-1.3.31
crafterpika:Canary-1.3.30

No commits in common. "c81a775a1d8cc7c4911b0a27f4010c257fa4c315" and "3719db2e4b9f2ec5e333a90c3d18ca3883134f70" have entirely different histories.
c81a775a1d ... 3719db2e4b

5 changed files with 5 additions and 7 deletions
Show stats Expand all files Collapse all files

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 + "assets/locales.json"; string path = projectPath + "src/Ryujinx/Assets/locales.json";
string data; string data;
using (StreamReader sr = new(path)) using (StreamReader sr = new(path))

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

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/Locale.json") _localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/locales.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,9 +154,7 @@
<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" />
@ -175,6 +173,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/Locale.json"; const string LocalePath = "Ryujinx/Assets/locales.json";
string languageJson = EmbeddedResources.ReadAllText(LocalePath); string languageJson = EmbeddedResources.ReadAllText(LocalePath);