Add localisation support for displayNames in DirectorySelector's related classes (#6700)

diquoks · web-flow · commit 23ac694fa2c3 · 2026-01-19T01:03:25.000+09:00
diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs
@@ -5,6 +5,7 @@
 
 using System.IO;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Framework.Graphics.UserInterface
@@ -20,7 +21,7 @@ public partial class BasicDirectorySelector : DirectorySelector
             Action = ShowHiddenItems.Toggle,
         };
 
-        protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName);
+        protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName);
 
         protected override DirectorySelectorDirectory CreateParentDirectoryItem(DirectoryInfo directory) => new BasicDirectorySelectorParentDirectory(directory);
 
diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Framework.Graphics.UserInterface
@@ -20,7 +21,7 @@ public partial class BasicDirectorySelectorBreadcrumbDisplay : DirectorySelector
 
         protected override DirectorySelectorDirectory CreateRootDirectoryItem() => new BreadcrumbDisplayComputer();
 
-        protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BreadcrumbDisplayDirectory(directory, displayName);
+        protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BreadcrumbDisplayDirectory(directory, displayName);
 
         protected partial class BreadcrumbDisplayComputer : BreadcrumbDisplayDirectory
         {
@@ -36,7 +37,7 @@ protected partial class BreadcrumbDisplayDirectory : BasicDirectorySelectorDirec
         {
             protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar) ? base.Icon : null;
 
-            public BreadcrumbDisplayDirectory(DirectoryInfo directory, string displayName = null)
+            public BreadcrumbDisplayDirectory(DirectoryInfo directory, LocalisableString? displayName = null)
                 : base(directory, displayName)
             {
             }
diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorDirectory.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorDirectory.cs
@@ -5,6 +5,7 @@
 
 using System.IO;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 
 namespace osu.Framework.Graphics.UserInterface
 {
@@ -19,7 +20,7 @@ public partial class BasicDirectorySelectorDirectory : DirectorySelectorDirector
             Font = FrameworkFont.Regular.With(size: FONT_SIZE)
         };
 
-        public BasicDirectorySelectorDirectory(DirectoryInfo directory, string displayName = null)
+        public BasicDirectorySelectorDirectory(DirectoryInfo directory, LocalisableString? displayName = null)
             : base(directory, displayName)
         {
         }
diff --git a/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs b/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Framework.Graphics.UserInterface
@@ -26,7 +27,7 @@ public BasicFileSelector(string initialPath = null, string[] validFileExtensions
             Action = ShowHiddenItems.Toggle,
         };
 
-        protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName);
+        protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName);
 
         protected override DirectorySelectorDirectory CreateParentDirectoryItem(DirectoryInfo directory) => new BasicDirectorySelectorParentDirectory(directory);
 
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelector.cs b/osu.Framework/Graphics/UserInterface/DirectorySelector.cs
@@ -11,6 +11,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osuTK;
 
@@ -42,7 +43,7 @@ public abstract partial class DirectorySelector : CompositeDrawable
         /// </remarks>
         protected virtual Drawable CreateHiddenToggleButton() => Empty();
 
-        protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null);
+        protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null);
 
         /// <summary>
         /// Create the directory item that resolves the parent directory.
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs
@@ -10,6 +10,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Framework.Graphics.UserInterface
@@ -25,7 +26,7 @@ public abstract partial class DirectorySelectorBreadcrumbDisplay : CompositeDraw
         /// <summary>
         /// Create a directory item in the breadcrumb trail.
         /// </summary>
-        protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null);
+        protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null);
 
         /// <summary>
         /// Create the root directory item in the breadcrumb trail.
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorDirectory.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorDirectory.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
 using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Localisation;
 
 namespace osu.Framework.Graphics.UserInterface
 {
@@ -20,7 +21,7 @@ public abstract partial class DirectorySelectorDirectory : DirectorySelectorItem
         [Resolved]
         private Bindable<DirectoryInfo> currentDirectory { get; set; }
 
-        protected DirectorySelectorDirectory(DirectoryInfo directory, string displayName = null)
+        protected DirectorySelectorDirectory(DirectoryInfo directory, LocalisableString? displayName = null)
             : base(displayName)
         {
             Directory = directory;
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs
@@ -6,13 +6,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Framework.Graphics.UserInterface
 {
     public abstract partial class DirectorySelectorItem : CompositeDrawable
     {
-        private readonly string displayName;
+        private readonly LocalisableString? displayName;
 
         /// <summary>
         /// Gets or sets the font size of this <see cref="DirectorySelectorItem"/>'s icon and text.
@@ -31,7 +32,7 @@ public abstract partial class DirectorySelectorItem : CompositeDrawable
 
         protected FillFlowContainer Flow;
 
-        protected DirectorySelectorItem(string displayName = null)
+        protected DirectorySelectorItem(LocalisableString? displayName = null)
         {
             this.displayName = displayName;
         }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.IO;`
`7`	`7`	`using osu.Framework.Allocation;`
`8`	`8`	`using osu.Framework.Graphics.Sprites;`
	`9`	`+using osu.Framework.Localisation;`
`9`	`10`	`using osuTK;`
`10`	`11`
`11`	`12`	`namespace osu.Framework.Graphics.UserInterface`
`@@ -20,7 +21,7 @@ public partial class BasicDirectorySelectorBreadcrumbDisplay : DirectorySelector`
`20`	`21`
`21`	`22`	`protected override DirectorySelectorDirectory CreateRootDirectoryItem() => new BreadcrumbDisplayComputer();`
`22`	`23`
`23`		`- protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BreadcrumbDisplayDirectory(directory, displayName);`
	`24`	`+ protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BreadcrumbDisplayDirectory(directory, displayName);`
`24`	`25`
`25`	`26`	`protected partial class BreadcrumbDisplayComputer : BreadcrumbDisplayDirectory`
`26`	`27`	`{`
`@@ -36,7 +37,7 @@ protected partial class BreadcrumbDisplayDirectory : BasicDirectorySelectorDirec`
`36`	`37`	`{`
`37`	`38`	`protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar) ? base.Icon : null;`
`38`	`39`
`39`		`- public BreadcrumbDisplayDirectory(DirectoryInfo directory, string displayName = null)`
	`40`	`+ public BreadcrumbDisplayDirectory(DirectoryInfo directory, LocalisableString? displayName = null)`
`40`	`41`	`: base(directory, displayName)`
`41`	`42`	`{`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`using System.IO;`
`7`	`7`	`using osu.Framework.Graphics.Sprites;`
	`8`	`+using osu.Framework.Localisation;`
`8`	`9`
`9`	`10`	`namespace osu.Framework.Graphics.UserInterface`
`10`	`11`	`{`
`@@ -19,7 +20,7 @@ public partial class BasicDirectorySelectorDirectory : DirectorySelectorDirector`
`19`	`20`	`Font = FrameworkFont.Regular.With(size: FONT_SIZE)`
`20`	`21`	`};`
`21`	`22`
`22`		`- public BasicDirectorySelectorDirectory(DirectoryInfo directory, string displayName = null)`
	`23`	`+ public BasicDirectorySelectorDirectory(DirectoryInfo directory, LocalisableString? displayName = null)`
`23`	`24`	`: base(directory, displayName)`
`24`	`25`	`{`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using osu.Framework.Bindables;`
`10`	`10`	`using osu.Framework.Input.Events;`
`11`	`11`	`using osu.Framework.Extensions.EnumExtensions;`
	`12`	`+using osu.Framework.Localisation;`
`12`	`13`
`13`	`14`	`namespace osu.Framework.Graphics.UserInterface`
`14`	`15`	`{`
`@@ -20,7 +21,7 @@ public abstract partial class DirectorySelectorDirectory : DirectorySelectorItem`
`20`	`21`	`[Resolved]`
`21`	`22`	`private Bindable<DirectoryInfo> currentDirectory { get; set; }`
`22`	`23`
`23`		`- protected DirectorySelectorDirectory(DirectoryInfo directory, string displayName = null)`
	`24`	`+ protected DirectorySelectorDirectory(DirectoryInfo directory, LocalisableString? displayName = null)`
`24`	`25`	`: base(displayName)`
`25`	`26`	`{`
`26`	`27`	`Directory = directory;`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,14 @@`
`6`	`6`	`using osu.Framework.Allocation;`
`7`	`7`	`using osu.Framework.Graphics.Containers;`
`8`	`8`	`using osu.Framework.Graphics.Sprites;`
	`9`	`+using osu.Framework.Localisation;`
`9`	`10`	`using osuTK;`
`10`	`11`
`11`	`12`	`namespace osu.Framework.Graphics.UserInterface`
`12`	`13`	`{`
`13`	`14`	`public abstract partial class DirectorySelectorItem : CompositeDrawable`
`14`	`15`	`{`
`15`		`- private readonly string displayName;`
	`16`	`+ private readonly LocalisableString? displayName;`
`16`	`17`
`17`	`18`	`/// <summary>`
`18`	`19`	`/// Gets or sets the font size of this <see cref="DirectorySelectorItem"/>'s icon and text.`
`@@ -31,7 +32,7 @@ public abstract partial class DirectorySelectorItem : CompositeDrawable`
`31`	`32`
`32`	`33`	`protected FillFlowContainer Flow;`
`33`	`34`
`34`		`- protected DirectorySelectorItem(string displayName = null)`
	`35`	`+ protected DirectorySelectorItem(LocalisableString? displayName = null)`
`35`	`36`	`{`
`36`	`37`	`this.displayName = displayName;`
`37`	`38`	`}`