From 7bce8206d5df5243e7888300938a0f0d637cd2a4 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Mon, 10 Feb 2025 13:59:25 -0600 Subject: [PATCH] misc: chore: small cleanups --- src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs | 4 ++-- .../Utilities/PlayReport/PlayReports.Formatters.cs | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 499eedc8d..113c00a5a 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -1147,10 +1147,10 @@ namespace Ryujinx.Ava.UI.ViewModels List dirs = result.Select(it => it.Path.LocalPath).ToList(); int numAdded = onDirsSelected(dirs, out int numRemoved); - string msg = String.Join("\r\n", new string[] { + string msg = string.Join("\n", string.Format(LocaleManager.Instance[localeMessageRemovedKey], numRemoved), string.Format(LocaleManager.Instance[localeMessageAddedKey], numAdded) - }); + ); await Dispatcher.UIThread.InvokeAsync(async () => { diff --git a/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs b/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs index f0d7f87ba..cabace6bb 100644 --- a/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs +++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs @@ -1,4 +1,5 @@ -using System; +using Gommon; +using System; using System.Buffers.Binary; using System.Collections.Generic; using System.Linq; @@ -281,9 +282,14 @@ namespace Ryujinx.Ava.Utilities.PlayReport players = players.OrderBy(p => p.Rank ?? int.MaxValue).ToList(); return players.Count > 4 - ? $"{players.Count} Players - " + string.Join(", ", - players.Take(3).Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")) - : string.Join(", ", players.Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")); + ? $"{players.Count} Players - { + players.Take(3) + .Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}") + .JoinToString(", ") + }" + : players + .Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}") + .JoinToString(", "); string RankMedal(int? rank) => rank switch {