diff --git a/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs b/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs index 932d3734fc3e..957c9d4bb3c0 100644 --- a/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs +++ b/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs @@ -16,7 +16,7 @@ public sealed partial class CloudDriveSyncStatusUI : ObservableObject public bool LoadSyncStatus { get; } - public string SyncStatusString { get; } = "CloudDriveSyncStatus_Unknown".GetLocalizedResource(); + public string SyncStatusString { get; } = Strings.CloudDriveSyncStatus_Unknown.GetLocalizedResource(); public CloudDriveSyncStatusUI() { diff --git a/src/Files.App/Utils/FileTags/FileTagsHelper.cs b/src/Files.App/Utils/FileTags/FileTagsHelper.cs index c60485fa04ea..96e9692cba29 100644 --- a/src/Files.App/Utils/FileTags/FileTagsHelper.cs +++ b/src/Files.App/Utils/FileTags/FileTagsHelper.cs @@ -42,8 +42,8 @@ public static async void WriteFileTag(string filePath, string[] tag) { ContentDialog dialog = new() { - Title = "ErrorApplyingTagTitle".GetLocalizedResource(), - Content = "ErrorApplyingTagContent".GetLocalizedResource(), + Title = Strings.ErrorApplyingTagTitle.GetLocalizedResource(), + Content = Strings.ErrorApplyingTagContent.GetLocalizedResource(), PrimaryButtonText = "Ok".GetLocalizedResource() }; diff --git a/src/Files.App/Utils/Git/GitHelpers.cs b/src/Files.App/Utils/Git/GitHelpers.cs index 1a11e66542b4..1a8fffc1e4e3 100644 --- a/src/Files.App/Utils/Git/GitHelpers.cs +++ b/src/Files.App/Utils/Git/GitHelpers.cs @@ -442,9 +442,9 @@ public static async Task PullOriginAsync(string? repositoryPath) { var viewModel = new DynamicDialogViewModel() { - TitleText = "GitError".GetLocalizedResource(), - SubtitleText = "PullTimeoutError".GetLocalizedResource(), - CloseButtonText = "Close".GetLocalizedResource(), + TitleText = Strings.GitError.GetLocalizedResource(), + SubtitleText = Strings.PullTimeoutError.GetLocalizedResource(), + CloseButtonText = Strings.Close.GetLocalizedResource(), DynamicButtons = DynamicDialogButtons.Cancel }; var dialog = new DynamicDialog(viewModel); @@ -570,7 +570,7 @@ public static async Task RequireGitAuthenticationAsync() var expiresIn = codeJsonContent.RootElement.GetProperty("expires_in").GetInt32(); var loginCTS = new CancellationTokenSource(); - var viewModel = new GitHubLoginDialogViewModel(userCode, "ConnectGitHubDescription".GetLocalizedResource(), loginCTS); + var viewModel = new GitHubLoginDialogViewModel(userCode, Strings.ConnectGitHubDescription.GetLocalizedResource(), loginCTS); var dialog = _dialogService.GetDialog(viewModel); var loginDialogTask = dialog.TryShowAsync(); @@ -621,7 +621,7 @@ public static async Task RequireGitAuthenticationAsync() GIT_RESOURCE_USERNAME, token); - viewModel.Subtitle = "AuthorizationSucceded".GetLocalizedResource(); + viewModel.Subtitle = Strings.AuthorizationSucceded.GetLocalizedResource(); viewModel.LoginConfirmed = true; } catch (Exception ex) @@ -687,10 +687,10 @@ public static GitItemModel GetGitInformationForItem(Repository repository, strin { changeKindHumanized = changeKind switch { - ChangeKind.Added => "Added".GetLocalizedResource(), - ChangeKind.Deleted => "Deleted".GetLocalizedResource(), - ChangeKind.Modified => "Modified".GetLocalizedResource(), - ChangeKind.Untracked => "Untracked".GetLocalizedResource(), + ChangeKind.Added => Strings.Added.GetLocalizedResource(), + ChangeKind.Deleted => Strings.Deleted.GetLocalizedResource(), + ChangeKind.Modified => Strings.Modified.GetLocalizedResource(), + ChangeKind.Untracked => Strings.Untracked.GetLocalizedResource(), _ => null, }; } diff --git a/src/Files.App/Utils/Library/LibraryManager.cs b/src/Files.App/Utils/Library/LibraryManager.cs index 09b6dfcbda49..c97c6abf8f29 100644 --- a/src/Files.App/Utils/Library/LibraryManager.cs +++ b/src/Files.App/Utils/Library/LibraryManager.cs @@ -255,20 +255,20 @@ public async Task UpdateLibrary(string libraryPath, string { if (string.IsNullOrWhiteSpace(name)) { - return (false, "ErrorInputEmpty".GetLocalizedResource()); + return (false, Strings.ErrorInputEmpty.GetLocalizedResource()); } if (FilesystemHelpers.ContainsRestrictedCharacters(name)) { - return (false, "ErrorNameInputRestrictedCharacters".GetLocalizedResource()); + return (false, Strings.ErrorNameInputRestrictedCharacters.GetLocalizedResource()); } if (FilesystemHelpers.ContainsRestrictedFileName(name)) { - return (false, "ErrorNameInputRestricted".GetLocalizedResource()); + return (false, Strings.ErrorNameInputRestricted.GetLocalizedResource()); } if (Libraries.Any((item) => string.Equals(name, item.Text, StringComparison.OrdinalIgnoreCase) || string.Equals(name, Path.GetFileNameWithoutExtension(item.Path), StringComparison.OrdinalIgnoreCase))) { - return (false, "CreateLibraryErrorAlreadyExists".GetLocalizedResource()); + return (false, Strings.CreateLibraryErrorAlreadyExists.GetLocalizedResource()); } return (true, string.Empty); } @@ -277,10 +277,10 @@ public static async Task ShowRestoreDefaultLibrariesDialogAsync() { var dialog = new DynamicDialog(new DynamicDialogViewModel { - TitleText = "DialogRestoreLibrariesTitleText".GetLocalizedResource(), - SubtitleText = "DialogRestoreLibrariesSubtitleText".GetLocalizedResource(), - PrimaryButtonText = "Restore".GetLocalizedResource(), - CloseButtonText = "Cancel".GetLocalizedResource(), + TitleText = Strings.DialogRestoreLibrariesTitleText.GetLocalizedResource(), + SubtitleText = Strings.DialogRestoreLibrariesSubtitleText.GetLocalizedResource(), + PrimaryButtonText = Strings.Restore.GetLocalizedResource(), + CloseButtonText = Strings.Cancel.GetLocalizedResource(), PrimaryButtonAction = async (vm, e) => { await ContextMenu.InvokeVerb("restorelibraries", ShellLibraryItem.LibrariesPath); @@ -303,7 +303,7 @@ public static async Task ShowCreateNewLibraryDialogAsync() { var inputText = new TextBox { - PlaceholderText = "FolderWidgetCreateNewLibraryInputPlaceholderText".GetLocalizedResource() + PlaceholderText = Strings.FolderWidgetCreateNewLibraryInputPlaceholderText.GetLocalizedResource() }; var tipText = new TextBlock { @@ -328,10 +328,10 @@ public static async Task ShowCreateNewLibraryDialogAsync() } } }, - TitleText = "FolderWidgetCreateNewLibraryDialogTitleText".GetLocalizedResource(), - SubtitleText = "SideBarCreateNewLibrary/Text".GetLocalizedResource(), - PrimaryButtonText = "Create".GetLocalizedResource(), - CloseButtonText = "Cancel".GetLocalizedResource(), + TitleText = Strings.FolderWidgetCreateNewLibraryDialogTitleText.GetLocalizedResource(), + SubtitleText = Strings.SideBarCreateNewLibrary_Text.GetLocalizedResource(), + PrimaryButtonText = Strings.Create.GetLocalizedResource(), + CloseButtonText = Strings.Cancel.GetLocalizedResource(), PrimaryButtonAction = async (vm, e) => { var (result, reason) = App.LibraryManager.CanCreateLibrary(inputText.Text); diff --git a/src/Files.App/Utils/Shell/ShellHelpers.cs b/src/Files.App/Utils/Shell/ShellHelpers.cs index ee32e5d4ae20..cb4610a7460e 100644 --- a/src/Files.App/Utils/Shell/ShellHelpers.cs +++ b/src/Files.App/Utils/Shell/ShellHelpers.cs @@ -28,10 +28,10 @@ public static string GetShellNameFromPath(string shPath) { return shPath switch { - "Home" => "Home".GetLocalizedResource(), - Constants.UserEnvironmentPaths.RecycleBinPath => "RecycleBin".GetLocalizedResource(), - Constants.UserEnvironmentPaths.NetworkFolderPath => "Network".GetLocalizedResource(), - Constants.UserEnvironmentPaths.MyComputerPath => "ThisPC".GetLocalizedResource(), + "Home" => Strings.Home.GetLocalizedResource(), + Constants.UserEnvironmentPaths.RecycleBinPath => Strings.RecycleBin.GetLocalizedResource(), + Constants.UserEnvironmentPaths.NetworkFolderPath => Strings.Network.GetLocalizedResource(), + Constants.UserEnvironmentPaths.MyComputerPath => Strings.ThisPC.GetLocalizedResource(), _ => shPath }; } diff --git a/src/Files.App/Utils/StatusCenter/StatusCenterItem.cs b/src/Files.App/Utils/StatusCenter/StatusCenterItem.cs index ac11edf8e8eb..ad3738a53728 100644 --- a/src/Files.App/Utils/StatusCenter/StatusCenterItem.cs +++ b/src/Files.App/Utils/StatusCenter/StatusCenterItem.cs @@ -199,7 +199,7 @@ public StatusCenterItem( AnimatedIconState = "NormalOff"; SpeedGraphValues = []; CancelCommand = new RelayCommand(ExecuteCancelCommand); - Message = "ProcessingItems".GetLocalizedResource(); + Message = Strings.ProcessingItems.GetLocalizedResource(); Source = source; Destination = destination; @@ -296,7 +296,7 @@ private void ReportProgress(StatusCenterItemProgressModel value) { Message = $"{string.Format( - "StatusCenter_ProcessedItems_Header".GetLocalizedResource(), + Strings.StatusCenter_ProcessedItems_Header.GetLocalizedResource(), value.ProcessedItemsCount, value.ItemsCount)}"; } @@ -304,7 +304,7 @@ private void ReportProgress(StatusCenterItemProgressModel value) { Message = $"{string.Format( - "StatusCenter_ProcessedSize_Header".GetLocalizedResource(), + Strings.StatusCenter_ProcessedSize_Header.GetLocalizedResource(), value.ProcessedSize.ToSizeString(), value.TotalSize.ToSizeString())}"; } @@ -393,7 +393,7 @@ public void ExecuteCancelCommand() IsCancelable = false; IsExpanded = false; IsSpeedAndProgressAvailable = false; - Header = $"{"Canceling".GetLocalizedResource()} - {Header}"; + Header = $"{Strings.Canceling.GetLocalizedResource()} - {Header}"; } } } diff --git a/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs b/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs index 30e1da0617c0..fb1f88962126 100644 --- a/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs +++ b/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs @@ -43,8 +43,8 @@ private void GroupedCollection_PropertyChanged(object sender, PropertyChangedEve { Model.CountText = string.Format( Count > 1 - ? "GroupItemsCount_Plural".GetLocalizedResource() - : "GroupItemsCount_Singular".GetLocalizedResource(), + ? Strings.GroupItemsCount_Plural.GetLocalizedResource() + : Strings.GroupItemsCount_Singular.GetLocalizedResource(), Count); } } diff --git a/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs b/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs index 8c2f15dafbc3..ef91971c8cf6 100644 --- a/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs +++ b/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs @@ -92,7 +92,7 @@ public static (Action>, Action(); private static readonly IStorageCacheService fileListCache = Ioc.Default.GetRequiredService(); - private static readonly string folderTypeTextLocalized = "Folder".GetLocalizedResource(); + private static readonly string folderTypeTextLocalized = Strings.Folder.GetLocalizedResource(); public static async Task> ListEntries( string path, @@ -112,7 +112,7 @@ private static IEnumerable EnumAdsForPath(string itemPath, ListedIte public static ListedItem GetAlternateStream((string Name, long Size) ads, ListedItem main) { - string itemType = "File".GetLocalizedResource(); + string itemType = Strings.File.GetLocalizedResource(); string itemFileExtension = null; if (ads.Name.Contains('.')) @@ -250,7 +250,7 @@ CancellationToken cancellationToken long itemSizeBytes = findData.GetSize(); var itemSize = itemSizeBytes.ToSizeString(); - string itemType = "File".GetLocalizedResource(); + string itemType = Strings.File.GetLocalizedResource(); string itemFileExtension = null; if (findData.cFileName.Contains('.')) @@ -289,7 +289,7 @@ CancellationToken cancellationToken ItemDateModifiedReal = itemModifiedDate, ItemDateAccessedReal = itemLastAccessDate, ItemDateCreatedReal = itemCreatedDate, - ItemType = "Shortcut".GetLocalizedResource(), + ItemType = Strings.Shortcut.GetLocalizedResource(), ItemPath = itemPath, FileSize = itemSize, FileSizeBytes = itemSizeBytes, @@ -311,7 +311,7 @@ CancellationToken cancellationToken ItemDateModifiedReal = itemModifiedDate, ItemDateAccessedReal = itemLastAccessDate, ItemDateCreatedReal = itemCreatedDate, - ItemType = "Shortcut".GetLocalizedResource(), + ItemType = Strings.Shortcut.GetLocalizedResource(), ItemPath = itemPath, FileSize = itemSize, FileSizeBytes = itemSizeBytes, @@ -342,7 +342,7 @@ CancellationToken cancellationToken ItemDateModifiedReal = itemModifiedDate, ItemDateAccessedReal = itemLastAccessDate, ItemDateCreatedReal = itemCreatedDate, - ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(), + ItemType = isUrl ? Strings.ShortcutWebLinkFileType.GetLocalizedResource() : Strings.Shortcut.GetLocalizedResource(), ItemPath = itemPath, FileSize = itemSize, FileSizeBytes = itemSizeBytes, @@ -368,7 +368,7 @@ CancellationToken cancellationToken ItemDateModifiedReal = itemModifiedDate, ItemDateAccessedReal = itemLastAccessDate, ItemDateCreatedReal = itemCreatedDate, - ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(), + ItemType = isUrl ? Strings.ShortcutWebLinkFileType.GetLocalizedResource() : Strings.Shortcut.GetLocalizedResource(), ItemPath = itemPath, FileSize = itemSize, FileSizeBytes = itemSizeBytes, diff --git a/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs b/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs index 1a16a5351ecb..2456e035c89c 100644 --- a/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs +++ b/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs @@ -42,10 +42,10 @@ public static async Task CheckEmptyDrive(string? drivePath) return false; var ejectButton = await DialogDisplayHelper.ShowDialogAsync( - "InsertDiscDialog/Title".GetLocalizedResource(), - string.Format("InsertDiscDialog/Text".GetLocalizedResource(), matchingDrive.Path), - "InsertDiscDialog/OpenDriveButton".GetLocalizedResource(), - "Close".GetLocalizedResource()); + Strings.InsertDiscDialog_Title.GetLocalizedResource(), + string.Format(Strings.InsertDiscDialog_Text.GetLocalizedResource(), matchingDrive.Path), + Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(), + Strings.Close.GetLocalizedResource()); if (ejectButton) EjectDeviceAsync(matchingDrive.Path); return true; diff --git a/src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs b/src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs index 5bfc5f15a7e2..7839c52ab4db 100644 --- a/src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs +++ b/src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs @@ -117,7 +117,7 @@ public static void OpenPropertiesWindow(object item, IShellPage associatedInstan propertiesWindow.SystemBackdrop = new AppSystemBackdrop(true); var appWindow = propertiesWindow.AppWindow; - appWindow.Title = "Properties".GetLocalizedResource(); + appWindow.Title = Strings.Properties.GetLocalizedResource(); appWindow.TitleBar.ExtendsContentIntoTitleBar = true; appWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent; appWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent; diff --git a/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs b/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs index 5dc479af6a10..6e99effb92d2 100644 --- a/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs +++ b/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs @@ -139,7 +139,7 @@ public static async Task> GetDirectoryPathComponentsWithDispla foreach (var item in pathBoxItems) { if (item.Path == "Home") - item.Title = "Home".GetLocalizedResource(); + item.Title = Strings.Home.GetLocalizedResource(); else { BaseStorageFolder folder = await FilesystemTasks.Wrap(() => DangerousGetFolderFromPathAsync(item.Path)); @@ -287,15 +287,15 @@ private static PathBoxItem GetPathItem(string component, string path) if (component.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal)) { // Handle the recycle bin: use the localized folder name - title = "RecycleBin".GetLocalizedResource(); + title = Strings.RecycleBin.GetLocalizedResource(); } else if (component.StartsWith(Constants.UserEnvironmentPaths.MyComputerPath, StringComparison.Ordinal)) { - title = "ThisPC".GetLocalizedResource(); + title = Strings.ThisPC.GetLocalizedResource(); } else if (component.StartsWith(Constants.UserEnvironmentPaths.NetworkFolderPath, StringComparison.Ordinal)) { - title = "Network".GetLocalizedResource(); + title = Strings.Network.GetLocalizedResource(); } else if (component.EndsWith(':')) { @@ -303,7 +303,7 @@ private static PathBoxItem GetPathItem(string component, string path) var drives = drivesViewModel.Drives.Cast(); var drive = drives.FirstOrDefault(y => y.ItemType is NavigationControlItemType.Drive && y.Path.Contains(component, StringComparison.OrdinalIgnoreCase)); - title = drive is not null ? drive.Text : string.Format("DriveWithLetter".GetLocalizedResource(), component); + title = drive is not null ? drive.Text : string.Format(Strings.DriveWithLetter.GetLocalizedResource(), component); } else { diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs index 92a801223e79..7234fedb9076 100644 --- a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs +++ b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs @@ -70,8 +70,8 @@ public FilesystemHelpers(IShellPage associatedInstance, CancellationToken cancel if (!IsValidForFilename(source.Name)) { await DialogDisplayHelper.ShowDialogAsync( - "ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), - "ErrorDialogNameNotAllowed".GetLocalizedResource()); + Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), + Strings.ErrorDialogNameNotAllowed.GetLocalizedResource()); return (ReturnResult.Failed, null); } @@ -547,8 +547,8 @@ public async Task RenameAsync(IStorageItemWithPath source, string if (!IsValidForFilename(newName)) { await DialogDisplayHelper.ShowDialogAsync( - "ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), - "ErrorDialogNameNotAllowed".GetLocalizedResource()); + Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), + Strings.ErrorDialogNameNotAllowed.GetLocalizedResource()); return ReturnResult.Failed; } @@ -569,7 +569,7 @@ await DialogDisplayHelper.ShowDialogAsync( UserSettingsService.FoldersSettingsService.ShowFileExtensionWarning ) { - var yesSelected = await DialogDisplayHelper.ShowDialogAsync("Rename".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource()); + var yesSelected = await DialogDisplayHelper.ShowDialogAsync(Strings.Rename.GetLocalizedResource(), Strings.RenameFileDialog_Text.GetLocalizedResource(), Strings.Yes.GetLocalizedResource(), Strings.No.GetLocalizedResource()); if (yesSelected) { history = await filesystemOperations.RenameAsync(source, newName, collision, progress, cancellationToken); @@ -877,7 +877,7 @@ public static string GetShortcutNamingPreference(string itemName) var value = Registry.GetValue(keyName, "ShortcutNameTemplate", null); if (value is null) - return string.Format("ShortcutCreateNewSuffix".GetLocalizedResource(), itemName) + ".lnk"; + return string.Format(Strings.ShortcutCreateNewSuffix.GetLocalizedResource(), itemName) + ".lnk"; else { // Trim the quotes and the "%s" from the string diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs index 56a064235335..72e49351393d 100644 --- a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs +++ b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs @@ -126,8 +126,8 @@ public async Task CopyAsync(IStorageItemWithPath source, string // Do not paste files and folders inside the recycle bin await DialogDisplayHelper.ShowDialogAsync( - "ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), - "ErrorDialogUnsupportedOperation".GetLocalizedResource()); + Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), + Strings.ErrorDialogUnsupportedOperation.GetLocalizedResource()); return null; } @@ -144,10 +144,10 @@ await DialogDisplayHelper.ShowDialogAsync( ContentDialog dialog = new() { - Title = "ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), - Content = $"{"ErrorDialogTheDestinationFolder".GetLocalizedResource()} ({destinationName}) {"ErrorDialogIsASubfolder".GetLocalizedResource()} ({sourceName})", + Title = Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), + Content = $"{Strings.ErrorDialogTheDestinationFolder.GetLocalizedResource()} ({destinationName}) {Strings.ErrorDialogIsASubfolder.GetLocalizedResource()} ({sourceName})", //PrimaryButtonText = "Skip".GetLocalizedResource(), - CloseButtonText = "Cancel".GetLocalizedResource() + CloseButtonText = Strings.Cancel.GetLocalizedResource() }; if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8)) @@ -327,8 +327,8 @@ public async Task MoveAsync(IStorageItemWithPath source, string // Do not paste files and folders inside the recycle bin await DialogDisplayHelper.ShowDialogAsync( - "ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), - "ErrorDialogUnsupportedOperation".GetLocalizedResource()); + Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), + Strings.ErrorDialogUnsupportedOperation.GetLocalizedResource()); return null; } @@ -346,10 +346,10 @@ await DialogDisplayHelper.ShowDialogAsync( ContentDialog dialog = new() { - Title = "ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), - Content = $"{"ErrorDialogTheDestinationFolder".GetLocalizedResource()} ({destinationName}) {"ErrorDialogIsASubfolder".GetLocalizedResource()} ({sourceName})", + Title = Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), + Content = $"{Strings.ErrorDialogTheDestinationFolder.GetLocalizedResource()} ({destinationName}) {Strings.ErrorDialogIsASubfolder.GetLocalizedResource()} ({sourceName})", //PrimaryButtonText = "Skip".GetLocalizedResource(), - CloseButtonText = "Cancel".GetLocalizedResource() + CloseButtonText = Strings.Cancel.GetLocalizedResource() }; if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8)) @@ -389,7 +389,7 @@ await DialogDisplayHelper.ShowDialogAsync( // Moving folders using Storage API can result in data loss, copy instead //var fsResultMove = await FilesystemTasks.Wrap(() => MoveDirectoryAsync((BaseStorageFolder)fsSourceFolder, (BaseStorageFolder)fsDestinationFolder, fsSourceFolder.Result.Name, collision.Convert(), true)); - if (await DialogDisplayHelper.ShowDialogAsync("ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), "ErrorDialogUnsupportedMoveOperation".GetLocalizedResource(), "OK", "Cancel".GetLocalizedResource())) + if (await DialogDisplayHelper.ShowDialogAsync(Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), Strings.ErrorDialogUnsupportedMoveOperation.GetLocalizedResource(), "OK", Strings.Cancel.GetLocalizedResource())) fsResultMove = await FilesystemTasks.Wrap(() => CloneDirectoryAsync((BaseStorageFolder)fsSourceFolder, (BaseStorageFolder)fsDestinationFolder, fsSourceFolder.Result.Name, collision.Convert())); } @@ -636,11 +636,11 @@ public async Task RenameAsync( } else if (renamed == FileSystemStatusCode.NotAFile || renamed == FileSystemStatusCode.NotAFolder) { - await DialogDisplayHelper.ShowDialogAsync("RenameError/NameInvalid/Title".GetLocalizedResource(), "RenameError/NameInvalid/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.RenameError_NameInvalid_Title.GetLocalizedResource(), Strings.RenameError_NameInvalid_Text.GetLocalizedResource()); } else if (renamed == FileSystemStatusCode.NameTooLong) { - await DialogDisplayHelper.ShowDialogAsync("RenameError/TooLong/Title".GetLocalizedResource(), "RenameError/TooLong/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.RenameError_TooLong_Title.GetLocalizedResource(), Strings.RenameError_TooLong_Text.GetLocalizedResource()); } else if (renamed == FileSystemStatusCode.InUse) { @@ -649,17 +649,17 @@ public async Task RenameAsync( } else if (renamed == FileSystemStatusCode.NotFound) { - await DialogDisplayHelper.ShowDialogAsync("RenameError/ItemDeleted/Title".GetLocalizedResource(), "RenameError/ItemDeleted/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.RenameError_ItemDeleted_Title.GetLocalizedResource(), Strings.RenameError_ItemDeleted_Text.GetLocalizedResource()); } else if (renamed == FileSystemStatusCode.AlreadyExists) { var ItemAlreadyExistsDialog = new ContentDialog() { - Title = "ItemAlreadyExistsDialogTitle".GetLocalizedResource(), - Content = "ItemAlreadyExistsDialogContent".GetLocalizedResource(), - PrimaryButtonText = "GenerateNewName".GetLocalizedResource(), - SecondaryButtonText = "ItemAlreadyExistsDialogSecondaryButtonText".GetLocalizedResource(), - CloseButtonText = "Cancel".GetLocalizedResource() + Title = Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), + Content = Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource(), + PrimaryButtonText = Strings.GenerateNewName.GetLocalizedResource(), + SecondaryButtonText = Strings.ItemAlreadyExistsDialogSecondaryButtonText.GetLocalizedResource(), + CloseButtonText = Strings.Cancel.GetLocalizedResource() }; ContentDialogResult result = await ItemAlreadyExistsDialog.TryShowAsync(); @@ -749,7 +749,7 @@ public async Task RestoreFromTrashAsync(IStorageItemWithPath so // Moving folders using Storage API can result in data loss, copy instead //fsResult = await FilesystemTasks.Wrap(() => MoveDirectoryAsync(sourceFolder.Result, destinationFolder.Result, Path.GetFileName(destination), CreationCollisionOption.FailIfExists, true)); - if (await DialogDisplayHelper.ShowDialogAsync("ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), "ErrorDialogUnsupportedMoveOperation".GetLocalizedResource(), "OK", "Cancel".GetLocalizedResource())) + if (await DialogDisplayHelper.ShowDialogAsync(Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), Strings.ErrorDialogUnsupportedMoveOperation.GetLocalizedResource(), "OK", Strings.Cancel.GetLocalizedResource())) fsResult = await FilesystemTasks.Wrap(() => CloneDirectoryAsync(sourceFolder.Result, destinationFolder.Result, Path.GetFileName(destination), CreationCollisionOption.FailIfExists)); // TODO: we could use here FilesystemHelpers with registerHistory false? @@ -792,15 +792,15 @@ await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancell { if (((FileSystemStatusCode)fsResult).HasFlag(FileSystemStatusCode.Unauthorized)) { - await DialogDisplayHelper.ShowDialogAsync("AccessDenied".GetLocalizedResource(), "AccessDeniedDeleteDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.AccessDenied.GetLocalizedResource(), Strings.AccessDeniedDeleteDialog_Text.GetLocalizedResource()); } else if (((FileSystemStatusCode)fsResult).HasFlag(FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource()); } else if (((FileSystemStatusCode)fsResult).HasFlag(FileSystemStatusCode.AlreadyExists)) { - await DialogDisplayHelper.ShowDialogAsync("ItemAlreadyExistsDialogTitle".GetLocalizedResource(), "ItemAlreadyExistsDialogContent".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource()); } } diff --git a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs index 17980a4723f1..e512d9c39978 100644 --- a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs +++ b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs @@ -149,18 +149,18 @@ await sourceMatch.Select(x => x.dest).ToListAsync(), } else if (copyResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource()); } else if (copyResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.AlreadyExists)) { - await DialogDisplayHelper.ShowDialogAsync("ItemAlreadyExistsDialogTitle".GetLocalizedResource(), "ItemAlreadyExistsDialogContent".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource()); } else if (copyResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss)) { var failedSources = copyResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss); var filePath = failedSources.Select(x => x.Source); - switch (await GetFileListDialog(filePath, "FilePropertiesCannotBeCopied".GetLocalizedResource(), "CopyFileWithoutProperties".GetLocalizedResource(), "OK".GetLocalizedResource(), "Cancel".GetLocalizedResource())) + switch (await GetFileListDialog(filePath, Strings.FilePropertiesCannotBeCopied.GetLocalizedResource(), Strings.CopyFileWithoutProperties.GetLocalizedResource(), Strings.OK.GetLocalizedResource(), Strings.Cancel.GetLocalizedResource())) { case DialogResult.Primary: var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll }); @@ -284,11 +284,11 @@ await sourceMatch.Select(x => x.dest).ToListAsync(), } else if (createResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource()); } else if (createResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.AlreadyExists)) { - await DialogDisplayHelper.ShowDialogAsync("ItemAlreadyExistsDialogTitle".GetLocalizedResource(), "ItemAlreadyExistsDialogContent".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource()); } fsProgress.ReportStatus(CopyEngineResult.Convert(createResult.Items.FirstOrDefault(x => !x.Succeeded)?.HResult)); @@ -430,7 +430,7 @@ public async Task DeleteItemsAsync(IList } else if (deleteResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource()); } else if (deleteResult.Items.All(x => x.HResult == -1) && permanently) // ADS { @@ -542,7 +542,7 @@ public async Task MoveItemsAsync(IList so var destName = subtree.dest.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries).Last(); var srcName = subtree.src.Path.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries).Last(); - await DialogDisplayHelper.ShowDialogAsync("ErrorDialogThisActionCannotBeDone".GetLocalizedResource(), $"{"ErrorDialogTheDestinationFolder".GetLocalizedResource()} ({destName}) {"ErrorDialogIsASubfolder".GetLocalizedResource()} ({srcName})"); + await DialogDisplayHelper.ShowDialogAsync(Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), $"{Strings.ErrorDialogTheDestinationFolder.GetLocalizedResource()} ({destName}) {Strings.ErrorDialogIsASubfolder.GetLocalizedResource()} ({srcName})"); } else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse)) { @@ -576,17 +576,17 @@ await sourceMatch.Select(x => x.dest).ToListAsync(), } else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource()); } else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.AlreadyExists)) { - await DialogDisplayHelper.ShowDialogAsync("ItemAlreadyExistsDialogTitle".GetLocalizedResource(), "ItemAlreadyExistsDialogContent".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource()); } else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss)) { var failedSources = moveResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss); var filePath = failedSources.Select(x => x.Source); - switch (await GetFileListDialog(filePath, "FilePropertiesCannotBeMoved".GetLocalizedResource(), "MoveFileWithoutProperties".GetLocalizedResource(), "OK".GetLocalizedResource(), "Cancel".GetLocalizedResource())) + switch (await GetFileListDialog(filePath, Strings.FilePropertiesCannotBeMoved.GetLocalizedResource(), Strings.MoveFileWithoutProperties.GetLocalizedResource(), Strings.OK.GetLocalizedResource(), Strings.Cancel.GetLocalizedResource())) { case DialogResult.Primary: var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll }); @@ -691,11 +691,11 @@ await DynamicDialogFactory } else if (renameResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("RenameError/ItemDeleted/Title".GetLocalizedResource(), "RenameError/ItemDeleted/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.RenameError_ItemDeleted_Title.GetLocalizedResource(), Strings.RenameError_ItemDeleted_Text.GetLocalizedResource()); } else if (renameResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.AlreadyExists)) { - await DialogDisplayHelper.ShowDialogAsync("ItemAlreadyExistsDialogTitle".GetLocalizedResource(), "ItemAlreadyExistsDialogContent".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource()); } // ADS else if (renameResult.Items.All(x => x.HResult == -1)) @@ -807,11 +807,11 @@ await sourceMatch.Select(x => x.src).ToListAsync(), } else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NotFound)) { - await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource()); } else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.AlreadyExists)) { - await DialogDisplayHelper.ShowDialogAsync("ItemAlreadyExistsDialogTitle".GetLocalizedResource(), "ItemAlreadyExistsDialogContent".GetLocalizedResource()); + await DialogDisplayHelper.ShowDialogAsync(Strings.ItemAlreadyExistsDialogTitle.GetLocalizedResource(), Strings.ItemAlreadyExistsDialogContent.GetLocalizedResource()); } fsProgress.ReportStatus(CopyEngineResult.Convert(moveResult.Items.FirstOrDefault(x => !x.Succeeded)?.HResult)); @@ -833,12 +833,12 @@ private async Task RequestAdminOperation() private Task GetFileInUseDialog(IEnumerable source, IEnumerable lockingProcess = null) { - var titleText = "FileInUseDialog/Title".GetLocalizedResource(); + var titleText = Strings.FileInUseDialog_Title.GetLocalizedResource(); var subtitleText = lockingProcess.IsEmpty() - ? "FileInUseDialog/Text".GetLocalizedResource() - : string.Format("FileInUseByDialog/Text".GetLocalizedResource(), string.Join(", ", lockingProcess.Select(x => $"{x.AppName ?? x.Name} (PID: {x.Pid})"))); + ? Strings.FileInUseDialog_Text.GetLocalizedResource() + : string.Format(Strings.FileInUseByDialog_Text.GetLocalizedResource(), string.Join(", ", lockingProcess.Select(x => $"{x.AppName ?? x.Name} (PID: {x.Pid})"))); - return GetFileListDialog(source, titleText, subtitleText, "Retry".GetLocalizedResource(), "Cancel".GetLocalizedResource()); + return GetFileListDialog(source, titleText, subtitleText, Strings.Retry.GetLocalizedResource(), Strings.Cancel.GetLocalizedResource()); } private async Task GetFileListDialog(IEnumerable source, string titleText, string descriptionText = null, string primaryButtonText = null, string secondaryButtonText = null) diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs index e0654cecdef6..42cb8309e7c6 100644 --- a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs +++ b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs @@ -28,7 +28,7 @@ public override string DisplayType { get { - var itemType = "File".GetLocalizedResource(); + var itemType = Strings.File.GetLocalizedResource(); if (Name.Contains('.', StringComparison.Ordinal)) { itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType; diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs index a9b0ee4a60b7..41208d412563 100644 --- a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs +++ b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs @@ -19,7 +19,7 @@ public sealed partial class FtpStorageFolder : BaseStorageFolder, IPasswordProte public override string Path { get; } public override string Name { get; } public override string DisplayName => Name; - public override string DisplayType => "Folder".GetLocalizedResource(); + public override string DisplayType => Strings.Folder.GetLocalizedResource(); public string FtpPath { get; } public override string FolderRelativeId => $"0\\{Name}"; diff --git a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs index ba4f95fa61a2..150471a043b9 100644 --- a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs +++ b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs @@ -34,7 +34,7 @@ public override string DisplayType { get { - var itemType = "File".GetLocalizedResource(); + var itemType = Strings.File.GetLocalizedResource(); if (Name.Contains('.', StringComparison.Ordinal)) itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType; diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs index 56d2d194d0c2..a9602339917b 100644 --- a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs +++ b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs @@ -24,7 +24,7 @@ public override string DisplayType { get { - var itemType = "File".GetLocalizedResource(); + var itemType = Strings.File.GetLocalizedResource(); if (Name.Contains('.', StringComparison.Ordinal)) { itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType; diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs index db7e48ab7971..d2c1b1cbc088 100644 --- a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs +++ b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs @@ -14,7 +14,7 @@ public sealed partial class VirtualStorageFolder : BaseStorageFolder public override string Path { get; } public override string Name { get; } public override string DisplayName => Name; - public override string DisplayType => "Folder".GetLocalizedResource(); + public override string DisplayType => Strings.Folder.GetLocalizedResource(); public override string FolderRelativeId => $"0\\{Name}"; public override DateTimeOffset DateCreated { get; } diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs index 5081a45cb421..91b304bbc3c8 100644 --- a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs +++ b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs @@ -30,7 +30,7 @@ public override string DisplayType { get { - var itemType = "File".GetLocalizedResource(); + var itemType = Strings.File.GetLocalizedResource(); if (Name.Contains('.', StringComparison.Ordinal)) { itemType = FileType.Trim('.') + " " + itemType; diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs index 7d9e6cd156ac..7dacb414ff3f 100644 --- a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs +++ b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs @@ -24,7 +24,7 @@ public sealed partial class ZipStorageFolder : BaseStorageFolder, ICreateFileWit public override string Path { get; } public override string Name { get; } public override string DisplayName => Name; - public override string DisplayType => "Folder".GetLocalizedResource(); + public override string DisplayType => Strings.Folder.GetLocalizedResource(); public override string FolderRelativeId => $"0\\{Name}"; public override DateTimeOffset DateCreated { get; } diff --git a/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs b/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs index 3604a7d43000..ecc590cf148f 100644 --- a/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs +++ b/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs @@ -237,10 +237,10 @@ private void ShowContextMenu() DestroyMenuSafeHandle hMenu = PInvoke.CreatePopupMenu_SafeHandle(); // Generate the classic context menu - PInvoke.AppendMenu(hMenu, MENU_ITEM_FLAGS.MF_BYCOMMAND, WM_FILES_CONTEXTMENU_DOCSLINK, "Documentation".GetLocalizedResource()); + PInvoke.AppendMenu(hMenu, MENU_ITEM_FLAGS.MF_BYCOMMAND, WM_FILES_CONTEXTMENU_DOCSLINK, Strings.Documentation.GetLocalizedResource()); PInvoke.AppendMenu(hMenu, MENU_ITEM_FLAGS.MF_SEPARATOR, 0u, string.Empty); //PInvoke.AppendMenu(hMenu, MENU_ITEM_FLAGS.MF_BYCOMMAND, WM_FILES_CONTEXTMENU_RESTART, "Restart".GetLocalizedResource()); - PInvoke.AppendMenu(hMenu, MENU_ITEM_FLAGS.MF_BYCOMMAND, WM_FILES_CONTEXTMENU_QUIT, "Quit".GetLocalizedResource()); + PInvoke.AppendMenu(hMenu, MENU_ITEM_FLAGS.MF_BYCOMMAND, WM_FILES_CONTEXTMENU_QUIT, Strings.Quit.GetLocalizedResource()); PInvoke.SetForegroundWindow(_IconWindow.WindowHandle); TRACK_POPUP_MENU_FLAGS tRACK_POPUP_MENU_FLAGS =