Fix: Fixed issue where items in the Tags widget were not localized (#13149)

Author: d2dyno1

src/Files.App.Storage/NativeStorage/NativeFile.cs

@@ -15,13 +15,13 @@ namespace Files.App.Storage.NativeStorage
 	/// <inheritdoc cref="IFile"/>
 	public class NativeFile : NativeStorable<FileInfo>, ILocatableFile, IModifiableFile, IFileExtended, INestedFile
 	{
-		public NativeFile(FileInfo fileInfo)
-			: base(fileInfo)
+		public NativeFile(FileInfo fileInfo, string? name = null)
+			: base(fileInfo, name)
 		{
 		}
 
-		public NativeFile(string path)
-			: this(new FileInfo(path))
+		public NativeFile(string path, string? name = null)
+			: this(new FileInfo(path), name)
 		{
 		}
 

src/Files.App.Storage/NativeStorage/NativeFolder.cs

@@ -22,13 +22,13 @@ namespace Files.App.Storage.NativeStorage
 	/// <inheritdoc cref="IFolder"/>
 	public class NativeFolder : NativeStorable<DirectoryInfo>, ILocatableFolder, IModifiableFolder, IMutableFolder, IFolderExtended, INestedFolder, IDirectCopy, IDirectMove
     {
-		public NativeFolder(DirectoryInfo directoryInfo)
-		    : base(directoryInfo)
+		public NativeFolder(DirectoryInfo directoryInfo, string? name = null)
+		    : base(directoryInfo, name)
 	    {
 	    }
 
-	    public NativeFolder(string path)
-		    : this(new DirectoryInfo(path))
+	    public NativeFolder(string path, string? name = null)
+		    : this(new DirectoryInfo(path), name)
 	    {
 	    }
 

src/Files.App.Storage/NativeStorage/NativeStorable.cs

@@ -17,19 +17,19 @@ public abstract class NativeStorable<TStorage> : ILocatableStorable, INestedStor
 		protected readonly TStorage storage;
 
 		/// <inheritdoc/>
-		public virtual string Path { get; protected set; }
+		public string Path { get; protected set; }
 
 		/// <inheritdoc/>
-		public virtual string Name { get; protected set; }
+		public string Name { get; protected set; }
 
 		/// <inheritdoc/>
 		public virtual string Id { get; }
 
-		protected NativeStorable(TStorage storage)
+		protected NativeStorable(TStorage storage, string? name = null)
 		{
 			this.storage = storage;
 			Path = storage.FullName;
-			Name = storage.Name;
+			Name = name ?? storage.Name;
 			Id = storage.FullName;
 		}
 

src/Files.App.Storage/NativeStorage/NativeStorageService.cs

@@ -2,10 +2,12 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
+using Files.Shared.Helpers;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Windows.Storage;
 
 namespace Files.App.Storage.NativeStorage
 {
@@ -22,12 +24,31 @@ public Task<IFile> GetFileAsync(string id, CancellationToken cancellationToken =
 		}
 
 		/// <inheritdoc/>
-		public Task<IFolder> GetFolderAsync(string id, CancellationToken cancellationToken = default)
+		public async Task<IFolder> GetFolderAsync(string id, CancellationToken cancellationToken = default)
 		{
 			if (!Directory.Exists(id))
 				throw new DirectoryNotFoundException();
 
-			return Task.FromResult<IFolder>(new NativeFolder(id));
+			// A special folder should use the localized name
+			if (PathHelpers.IsSpecialFolder(id))
+			{
+				var storageFolder = await TryGetStorageFolderAsync(id);
+				return new NativeFolder(id, storageFolder?.DisplayName);
+			}
+
+			return new NativeFolder(id);
+
+			async Task<StorageFolder?> TryGetStorageFolderAsync(string path)
+			{
+				try
+				{
+					return await StorageFolder.GetFolderFromPathAsync(path);
+				}
+				catch (Exception)
+				{
+					return null;
+				}
+			}
 		}
 	}
 }

src/Files.App/Actions/Content/Archives/DecompressArchive.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using System.IO;
 
 namespace Files.App.Actions

src/Files.App/Actions/Content/Install/InstallCertificateAction.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
+using Files.Shared.Helpers;
 
 namespace Files.App.Actions
 {

src/Files.App/Actions/Content/Install/InstallFontAction.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
+using Files.Shared.Helpers;
 
 namespace Files.App.Actions
 {

src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
+using Files.Shared.Helpers;
 
 namespace Files.App.Actions
 {

src/Files.App/Actions/Content/PlayAllAction.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
+
 namespace Files.App.Actions
 {
 	internal class PlayAllAction : ObservableObject, IAction

src/Files.App/Actions/Content/Run/RunAsAdminAction.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
+
 namespace Files.App.Actions
 {
 	internal class RunAsAdminAction : ObservableObject, IAction

src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
+
 namespace Files.App.Actions
 {
 	internal class RunAsAnotherUserAction : ObservableObject, IAction

src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
+using Files.Shared.Helpers;
 
 namespace Files.App.Actions
 {

src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs

@@ -4,6 +4,7 @@
 using Files.Core.Helpers;
 using Microsoft.UI.Xaml;
 using Windows.Storage;
+using Files.Shared.Helpers;
 
 namespace Files.App.Data.Factories
 {

src/Files.App/Data/Items/ListedItem.cs

@@ -1,14 +1,10 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Cloud;
 using Files.App.ViewModels.Properties;
-using Files.Core.Helpers;
-using Files.Core.ViewModels.FileTags;
+using Files.Shared.Helpers;
 using FluentFTP;
-using Microsoft.UI;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
 using System.Text;

src/Files.App/Data/Models/ItemViewModel.cs

@@ -3,6 +3,7 @@
 
 using Files.App.ViewModels.Previews;
 using Files.Core.Services.SizeProvider;
+using Files.Shared.Helpers;
 using LibGit2Sharp;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Data;

src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.ViewModels.Properties;
+using Files.Shared.Helpers;
 
 namespace Files.App.Data.Models
 {

src/Files.App/Data/Models/SidebarPinnedModel.cs

@@ -1,9 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.WinUI;
-using Files.App.Data.Items;
-using Files.App.Services;
 using Files.App.UserControls.Widgets;
 using System.Collections.Specialized;
 using System.IO;

src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.App.ViewModels.LayoutModes;
+using Files.Shared.Helpers;
 using Files.App.Helpers.ContextFlyouts;
 using Files.App.ViewModels.LayoutModes;
 using Microsoft.UI.Xaml.Controls;

src/Files.App/Helpers/MenuFlyout/ShellContextMenuHelper.cs

@@ -3,6 +3,7 @@
 
 using CommunityToolkit.WinUI.UI;
 using Files.App.Helpers.ContextFlyouts;
+using Files.Shared.Helpers;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;

src/Files.App/Helpers/Navigation/NavigationHelpers.cs

@@ -1,20 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Extensions;
-using Files.App.Utils;
-using Files.App.Utils.Shell;
-using Files.App.ViewModels;
-using Files.App.Views;
-using Files.Core.Helpers;
-using Files.Core.Services.Settings;
-using Files.Shared;
+using Files.Shared.Helpers;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.Storage.Search;
 using Windows.System;

src/Files.App/Program.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;

src/Files.App/Utils/Archives/ArchiveHelpers.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Dialogs;
-using Files.App.Utils.Archives;
 using Files.App.ViewModels.Dialogs;
+using Files.Shared.Helpers;
 using Microsoft.UI.Xaml.Controls;
 using System.IO;
 using System.Text;

src/Files.App/Utils/Shell/LaunchHelper.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Microsoft.Extensions.Logging;
 using System.IO;
 using System.Text.RegularExpressions;

src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;

src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.Core.Services.SizeProvider;
+using Files.Shared.Helpers;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
 using Vanara.PInvoke;

src/Files.App/Utils/Storage/Helpers/FileOperationsHelpers.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System.Collections.Concurrent;

src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 

src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using System.Runtime.InteropServices;
 using Windows.Storage;
 using Windows.Storage.FileProperties;

src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Microsoft.UI.Xaml.Controls;
 using System.IO;
 using System.Text;

src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;

src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using SevenZip;
 using System.IO;
 using System.Runtime.InteropServices.WindowsRuntime;

src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs

@@ -1,9 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using SevenZip;
-using SQLitePCL;
-using System;
 using System.Collections.Concurrent;
 using System.IO;
 using System.Runtime.InteropServices.WindowsRuntime;

src/Files.App/ViewModels/Properties/Items/FileProperties.cs

@@ -1,6 +1,7 @@
 // Copyright(c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Helpers;
 using Microsoft.UI.Dispatching;
 using System.IO;
 

src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs

@@ -3,6 +3,7 @@
 
 using Files.App.UserControls.FilePreviews;
 using Files.App.ViewModels.Previews;
+using Files.Shared.Helpers;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Windows.Input;

src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.UI;
+using Files.Shared.Helpers;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;