Skip to content

Commit 2640d80

Browse files
committed
Re-adjust cherry-pick changes to Stable code
1 parent 0b4ce92 commit 2640d80

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

CollapseLauncher/Classes/InstallManagement/Base/InstallManagerBase.Sophon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ await x.GetDownloadedPreloadSize(
869869
Status.IsProgressPerFileIndetermined = false;
870870
Status.IsProgressAllIndetermined = false;
871871
Status.ActivityStatus = $"{(IsSophonInUpdateMode && !isPreloadMode
872-
? Locale.Current.Lang?._Misc?.UpdatingAndApplying
873-
: isSophonPreloadCompleted ? Locale.Current.Lang?._Misc?.Verifying : Locale.Current.Lang?._Misc?.Downloading)}: {string.Format(Locale.Current.Lang?._Misc?.PerFromTo ?? "", ProgressAllCountCurrent,
872+
? Locale.Lang?._Misc?.UpdatingAndApplying
873+
: isSophonPreloadCompleted ? Locale.Lang?._Misc?.Verifying : Locale.Lang?._Misc?.Downloading)}: {string.Format(Locale.Lang?._Misc?.PerFromTo ?? "", ProgressAllCountCurrent,
874874
ProgressAllCountTotal)}";
875875
UpdateStatus();
876876

CollapseLauncher/Classes/InstallManagement/Base/InstallManagerBase.SophonPatch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ void UpdateCurrentDownloadStatus()
672672
string perFromToLocale = string.Format(Locale.Lang._Misc.PerFromTo,
673673
ProgressAllCountCurrent,
674674
ProgressAllCountTotal);
675-
Status.ActivityStatus = $"{(IsSophonInPreloadVerifyMode ? Locale.Current.Lang?._Misc?.Verifying : Locale.Current.Lang?._Misc?.Downloading)}: {perFromToLocale}";
675+
Status.ActivityStatus = $"{(IsSophonInPreloadVerifyMode ? Locale.Lang?._Misc?.Verifying : Locale.Lang?._Misc?.Downloading)}: {perFromToLocale}";
676676
UpdateStatus();
677677
}
678678

CollapseLauncher/Classes/Interfaces/Class/ProgressBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ protected void UpdateSophonDownloadStatus(SophonAsset _)
582582
{
583583
Interlocked.Add(ref ProgressAllCountCurrent, 1);
584584
Status.ActivityStatus = $"{(IsSophonInUpdateMode
585-
? Locale.Current.Lang?._Misc?.Updating
586-
: IsSophonInPreloadVerifyMode ? Locale.Current.Lang?._Misc?.Verifying : Locale.Current.Lang?._Misc?.Downloading)}: {string.Format(Locale.Current.Lang?._Misc?.PerFromTo ?? "", ProgressAllCountCurrent,
585+
? Locale.Lang?._Misc?.Updating
586+
: IsSophonInPreloadVerifyMode ? Locale.Lang?._Misc?.Verifying : Locale.Lang?._Misc?.Downloading)}: {string.Format(Locale.Lang?._Misc?.PerFromTo ?? "", ProgressAllCountCurrent,
587587
ProgressAllCountTotal)}";
588588
UpdateStatus();
589589
}

0 commit comments

Comments
 (0)