MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Unified locales #391

Merged
LotP1 merged 25 commits from unified-locales into master 2024-12-20 19:27:11 +00:00
Conversation 6 Commits 25 Files Changed 28 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit af4a71d6eb - Show all commits

4
src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
View File

@ -26,7 +26,7 @@ namespace Ryujinx.BuildValidationTasks
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
data = sr.ReadToEnd(); data = sr.ReadToEnd();
} }
LocalesJSON json = JsonConvert.DeserializeObject<LocalesJSON>(data); LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
for (int i = 0; i < json.Locales.Count; i++) for (int i = 0; i < json.Locales.Count; i++)
{ {
@ -55,7 +55,7 @@ namespace Ryujinx.BuildValidationTasks
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
return true; return true;
} }
struct LocalesJSON struct LocalesJson
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
{ {
public List<string> Languages { get; set; } public List<string> Languages { get; set; }
public List<LocalesEntry> Locales { get; set; } public List<LocalesEntry> Locales { get; set; }

WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`
WilliamWsyHK commented 2024-12-18 13:51:48 +00:00 (Migrated from github.com)
Review
Copy Link

A minor comment: LocalesJSON -> LocalesJson

A minor comment: `LocalesJSON` -> `LocalesJson`

8
src/Ryujinx/Common/LocaleManager.cs
View File

@ -158,7 +158,7 @@ namespace Ryujinx.Ava.Common.Locale
return null; return null;
} }
LocalesJSON json = JsonHelper.Deserialize(fileData, LocalesJSONContext.Default.LocalesJSON); LocalesJson json = JsonHelper.Deserialize(fileData, LocalesJsonContext.Default.LocalesJSON);
foreach (LocalesEntry locale in json.Locales) foreach (LocalesEntry locale in json.Locales)
{ {
@ -186,7 +186,7 @@ namespace Ryujinx.Ava.Common.Locale
} }
} }
public struct LocalesJSON public struct LocalesJson
{ {
public List<string> Languages { get; set; } public List<string> Languages { get; set; }
public List<LocalesEntry> Locales { get; set; } public List<LocalesEntry> Locales { get; set; }
@ -199,6 +199,6 @@ namespace Ryujinx.Ava.Common.Locale
} }
[JsonSourceGenerationOptions(WriteIndented = true)] [JsonSourceGenerationOptions(WriteIndented = true)]
[JsonSerializable(typeof(LocalesJSON))] [JsonSerializable(typeof(LocalesJson))]
internal partial class LocalesJSONContext : JsonSerializerContext { } internal partial class LocalesJsonContext : JsonSerializerContext { }
} }

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

@ -58,7 +58,7 @@ namespace Ryujinx.Ava.UI.Views.Main
string languageJson = EmbeddedResources.ReadAllText(localePath); string languageJson = EmbeddedResources.ReadAllText(localePath);
LocalesJSON locales = JsonHelper.Deserialize(languageJson, LocalesJSONContext.Default.LocalesJSON); LocalesJson locales = JsonHelper.Deserialize(languageJson, LocalesJsonContext.Default.LocalesJSON);
foreach (string language in locales.Languages) foreach (string language in locales.Languages)
{ {