aecw/Ez2Lazer
1
0
Fork 0
mirror of https://github.com/SK-la/Ez2Lazer.git synced 2026-03-15 03:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'localisation/perform-from-menu-runner-notification' into localisation/osu-game-notifications

Browse Source 
# Conflicts:
#	osu.Game/Localisation/NotificationsStrings.cs
This commit is contained in:
Denis Titovets
2026-01-12 19:01:06 +03:00
parent 40d8fb6316 f320592229
commit b15b4e70a5
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Localisation/NotificationsStrings.cs
View File

@@ -210,6 +210,11 @@ Click to see what's new!", version);
/// </summary>
public static LocalisableString UpdateNoAction => new TranslatableString(getKey(@"update_no_action"), @"Check with your package manager / provider to bring osu! up-to-date!");
/// <summary>
/// "An action was interrupted due to a dialog being displayed."
/// </summary>
public static LocalisableString ActionInterruptedByDialog => new TranslatableString(getKey(@"action_interrupted_by_dialog"), @"An action was interrupted due to a dialog being displayed.");
private static string getKey(string key) => $@"{prefix}:{key}";
}
}

7
osu.Game/PerformFromMenuRunner.cs
View File

@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Framework.Threading;
using osu.Game.Localisation;
using osu.Game.Overlays;
using osu.Game.Overlays.Dialog;
using osu.Game.Overlays.Notifications;
@@ -165,7 +166,11 @@ namespace osu.Game
// the last dialog encountered has been dismissed but the screen has not changed, abort.
Cancel();
notifications.Post(new SimpleNotification { Text = @"An action was interrupted due to a dialog being displayed." });
notifications.Post(new SimpleNotification
{
Text = NotificationsStrings.ActionInterruptedByDialog
});
return true;
}