From d114a468897d43a49c0ecb7cc1dc6016f7ffb8cf Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:43:23 +0000 Subject: [PATCH] Files.App.Data --- src/Files.App/Data/Commands/HotKey/HotKey.cs | 2 +- .../Factories/AppThemeResourcesFactory.cs | 40 +++++++-------- .../PropertiesNavigationViewItemFactory.cs | 16 +++--- ...ecurityAdvancedAccessControlItemFactory.cs | 50 +++++++++---------- .../Factories/ShellContextFlyoutHelper.cs | 4 +- .../Data/Items/AccessControlEntry.cs | 26 +++++----- src/Files.App/Data/Items/AppLanguageItem.cs | 2 +- src/Files.App/Data/Items/DriveItem.cs | 8 +-- src/Files.App/Data/Models/ByteSize.cs | 14 +++--- .../Models/DirectoryPropertiesViewModel.cs | 2 +- .../Data/Models/PinnedFoldersManager.cs | 4 +- 11 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/Files.App/Data/Commands/HotKey/HotKey.cs b/src/Files.App/Data/Commands/HotKey/HotKey.cs index 573879567bff..215203aadb6a 100644 --- a/src/Files.App/Data/Commands/HotKey/HotKey.cs +++ b/src/Files.App/Data/Commands/HotKey/HotKey.cs @@ -365,7 +365,7 @@ private static string GetLocalizedKey(string key) private static string GetLocalizedNumPadKey(string key) { - return "NumPadTypeName".GetLocalizedResource() + " " + key; + return Strings.NumPadTypeName.GetLocalizedResource() + " " + key; } private static string GetKeyCharacter(Forms.Keys key) diff --git a/src/Files.App/Data/Factories/AppThemeResourcesFactory.cs b/src/Files.App/Data/Factories/AppThemeResourcesFactory.cs index 47ebb2097765..f1fbbbaaac54 100644 --- a/src/Files.App/Data/Factories/AppThemeResourcesFactory.cs +++ b/src/Files.App/Data/Factories/AppThemeResourcesFactory.cs @@ -10,102 +10,102 @@ public static class AppThemeResourceFactory new AppThemeResourceItem { BackgroundColor = "#00000000", /* Transparent */ - Name = "Default".GetLocalizedResource() + Name = Strings.Default.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32FFB900", /* #FFB900 */ - Name = "YellowGold".GetLocalizedResource() + Name = Strings.YellowGold.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32F7630C", /* #F7630C */ - Name = "OrangeBright".GetLocalizedResource() + Name = Strings.OrangeBright.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32D13438", /* #D13438 */ - Name = "BrickRed".GetLocalizedResource() + Name = Strings.BrickRed.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32FF4343", /* #FF4343 */ - Name = "ModRed".GetLocalizedResource() + Name = Strings.ModRed.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32EA005E", /* #EA005E */ - Name = "Red".GetLocalizedResource() + Name = Strings.Red.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32EA005E", /* #EA005E */ - Name = "RoseBright".GetLocalizedResource() + Name = Strings.RoseBright.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#320078D7", /* #0078D7 */ - Name = "Blue".GetLocalizedResource() + Name = Strings.Blue.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#328764B8", /* #8764B8 */ - Name = "IrisPastel".GetLocalizedResource() + Name = Strings.IrisPastel.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32B146C2", /* #B146C2 */ - Name = "VioletRedLight".GetLocalizedResource() + Name = Strings.VioletRedLight.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#320099BC", /* #0099BC */ - Name = "CoolBlueBright".GetLocalizedResource() + Name = Strings.CoolBlueBright.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#3200B7C3", /* #00B7C3 */ - Name = "Seafoam".GetLocalizedResource() + Name = Strings.Seafoam.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#3200B294", /* #00B294 */ - Name = "MintLight".GetLocalizedResource() + Name = Strings.MintLight.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#327A7574", /* #7A7574 */ - Name = "Gray".GetLocalizedResource() + Name = Strings.Gray.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32107C10", /* #107C10 */ - Name = "Green".GetLocalizedResource() + Name = Strings.Green.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#32767676", /* #767676 */ - Name = "Overcast".GetLocalizedResource() + Name = Strings.Overcast.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#324C4A48", /* #4C4A48 */ - Name = "Storm".GetLocalizedResource() + Name = Strings.Storm.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#3269797E", /* #69797E */ - Name = "BlueGray".GetLocalizedResource() + Name = Strings.BlueGray.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#324A5459", /* #4A5459 */ - Name = "GrayDark".GetLocalizedResource() + Name = Strings.GrayDark.GetLocalizedResource() }, new AppThemeResourceItem { BackgroundColor = "#327E735F", /* #7E735F */ - Name = "Camouflage".GetLocalizedResource() + Name = Strings.Camouflage.GetLocalizedResource() } ]; } diff --git a/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs b/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs index 59b17fcd7577..f546301858e4 100644 --- a/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs +++ b/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs @@ -15,49 +15,49 @@ public static ObservableCollection Initialize var generalItem = new NavigationViewItemButtonStyleItem() { - Name = "General".GetLocalizedResource(), + Name = Strings.General.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.General, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.General"], }; var securityItem = new NavigationViewItemButtonStyleItem() { - Name = "Security".GetLocalizedResource(), + Name = Strings.Security.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Security, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Security"], }; var hashesItem = new NavigationViewItemButtonStyleItem() { - Name = "Hashes".GetLocalizedResource(), + Name = Strings.Hashes.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Hashes, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Hashes"], }; var shortcutItem = new NavigationViewItemButtonStyleItem() { - Name = "Shortcut".GetLocalizedResource(), + Name = Strings.Shortcut.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Shortcut, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Shortcut"], }; var libraryItem = new NavigationViewItemButtonStyleItem() { - Name = "Library".GetLocalizedResource(), + Name = Strings.Library.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Library, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Library"], }; var detailsItem = new NavigationViewItemButtonStyleItem() { - Name = "Details".GetLocalizedResource(), + Name = Strings.Details.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Details, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Info"], }; var customizationItem = new NavigationViewItemButtonStyleItem() { - Name = "Customization".GetLocalizedResource(), + Name = Strings.Customization.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Customization, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.CustomizeFolder"], }; var compatibilityItem = new NavigationViewItemButtonStyleItem() { - Name = "Compatibility".GetLocalizedResource(), + Name = Strings.Compatibility.GetLocalizedResource(), ItemType = PropertiesNavigationViewItemType.Compatibility, ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Compatability"], }; diff --git a/src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs b/src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs index c693f3a120cb..eefb0642b2ba 100644 --- a/src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs +++ b/src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs @@ -28,109 +28,109 @@ public static ObservableCollection Initialize(AccessControlEntry new(current) { AccessMask = AccessMaskFlags.FullControl, - AccessMaskName = "SecurityFullControlLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityFullControlLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.Traverse, - AccessMaskName = "SecurityTraverseLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityTraverseLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ExecuteFile, - AccessMaskName = "SecurityExecuteFileLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityExecuteFileLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ListDirectory, - AccessMaskName = "SecurityListDirectoryLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityListDirectoryLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ReadData, - AccessMaskName = "SecurityReadDataLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityReadDataLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ReadAttributes, - AccessMaskName = "SecurityReadAttributesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityReadAttributesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ReadExtendedAttributes, - AccessMaskName = "SecurityReadExtendedAttributesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityReadExtendedAttributesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.CreateFiles, - AccessMaskName = "SecurityCreateFilesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityCreateFilesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.CreateDirectories, - AccessMaskName = "SecurityCreateDirectoriesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityCreateDirectoriesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.WriteData, - AccessMaskName = "SecurityWriteDataLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityWriteDataLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.AppendData, - AccessMaskName = "SecurityAppendDataLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityAppendDataLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.WriteAttributes, - AccessMaskName = "SecurityWriteAttributesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityWriteAttributesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.WriteExtendedAttributes, - AccessMaskName = "SecurityWriteExtendedAttributesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityWriteExtendedAttributesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.DeleteSubdirectoriesAndFiles, - AccessMaskName = "SecurityDeleteSubdirectoriesAndFilesLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityDeleteSubdirectoriesAndFilesLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.Delete, - AccessMaskName = "Delete".GetLocalizedResource(), + AccessMaskName = Strings.Delete.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ReadPermissions, - AccessMaskName = "SecurityReadPermissionsLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityReadPermissionsLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ChangePermissions, - AccessMaskName = "SecurityChangePermissionsLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityChangePermissionsLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.TakeOwnership, - AccessMaskName = "SecurityTakeOwnershipLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityTakeOwnershipLabel_Text.GetLocalizedResource(), IsEditable = !isInherited } ]; @@ -160,42 +160,42 @@ public static ObservableCollection Initialize(AccessControlEntry new(current) { AccessMask = AccessMaskFlags.FullControl, - AccessMaskName = "SecurityFullControlLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityFullControlLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.Modify, - AccessMaskName = "Modify".GetLocalizedResource(), + AccessMaskName = Strings.Modify.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ReadAndExecute, - AccessMaskName = "SecurityReadAndExecuteLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityReadAndExecuteLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.ListDirectory, - AccessMaskName = "SecurityListDirectoryLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityListDirectoryLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.Read, - AccessMaskName = "SecurityReadLabel/Text".GetLocalizedResource(), + AccessMaskName = Strings.SecurityReadLabel_Text.GetLocalizedResource(), IsEditable = !isInherited }, new(current) { AccessMask = AccessMaskFlags.Write, - AccessMaskName = "Write".GetLocalizedResource(), + AccessMaskName = Strings.Write.GetLocalizedResource(), IsEditable = !isInherited }, new(current, false) { - AccessMaskName = "SecuritySpecialLabel/Text".GetLocalizedResource() + AccessMaskName = Strings.SecuritySpecialLabel_Text.GetLocalizedResource() } ]; diff --git a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs index 39a5ed09af27..836ff7ed3ea8 100644 --- a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs +++ b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs @@ -88,7 +88,7 @@ private static void LoadMenuFlyoutItem( { var menuLayoutSubItem = new ContextMenuFlyoutItemViewModel() { - Text = "ShowMoreOptions".GetLocalizedResource(), + Text = Strings.ShowMoreOptions.GetLocalizedResource(), Glyph = "\xE712", }; LoadMenuFlyoutItem(menuLayoutSubItem.Items, contextMenu, overflowItems, cancellationToken, showIcons); @@ -335,7 +335,7 @@ x.Tag is Win32ContextMenuItem menuItem && overflowItem.Visibility = overflowItems?.Any() ?? false ? Visibility.Visible : Visibility.Collapsed; overflowSeparator.Visibility = overflowItems?.Any() ?? false ? Visibility.Visible : Visibility.Collapsed; - overflowItem.Label = "ShowMoreOptions".GetLocalizedResource(); + overflowItem.Label = Strings.ShowMoreOptions.GetLocalizedResource(); overflowItem.IsEnabled = true; } diff --git a/src/Files.App/Data/Items/AccessControlEntry.cs b/src/Files.App/Data/Items/AccessControlEntry.cs index 4b23f437b7a3..6a50acebc88e 100644 --- a/src/Files.App/Data/Items/AccessControlEntry.cs +++ b/src/Files.App/Data/Items/AccessControlEntry.cs @@ -36,8 +36,8 @@ public bool IsEditable public string AccessControlTypeHumanized => AccessControlType switch { - AccessControlEntryType.Allow => "Allow".GetLocalizedResource(), - _ => "Deny".GetLocalizedResource() // AccessControlType.Deny + AccessControlEntryType.Allow => Strings.Allow.GetLocalizedResource(), + _ => Strings.Deny.GetLocalizedResource() // AccessControlType.Deny }; /// @@ -60,22 +60,22 @@ public string AccessMaskFlagsHumanized var accessMaskStrings = new List(); if (AccessMaskFlags == AccessMaskFlags.NULL) - accessMaskStrings.Add("None".GetLocalizedResource()); + accessMaskStrings.Add(Strings.None.GetLocalizedResource()); if (FullControlAccess) - accessMaskStrings.Add("SecurityFullControlLabel/Text".GetLocalizedResource()); + accessMaskStrings.Add(Strings.SecurityFullControlLabel_Text.GetLocalizedResource()); else if (ModifyAccess) - accessMaskStrings.Add("Modify".GetLocalizedResource()); + accessMaskStrings.Add(Strings.Modify.GetLocalizedResource()); else if (ReadAndExecuteAccess) - accessMaskStrings.Add("SecurityReadAndExecuteLabel/Text".GetLocalizedResource()); + accessMaskStrings.Add(Strings.SecurityReadAndExecuteLabel_Text.GetLocalizedResource()); else if (ReadAccess) - accessMaskStrings.Add("SecurityReadLabel/Text".GetLocalizedResource()); + accessMaskStrings.Add(Strings.SecurityReadLabel_Text.GetLocalizedResource()); if (!FullControlAccess && !ModifyAccess && WriteAccess) - accessMaskStrings.Add("Write".GetLocalizedResource()); + accessMaskStrings.Add(Strings.Write.GetLocalizedResource()); if (SpecialAccess) - accessMaskStrings.Add("SecuritySpecialLabel/Text".GetLocalizedResource()); + accessMaskStrings.Add(Strings.SecuritySpecialLabel_Text.GetLocalizedResource()); return string.Join(", ", accessMaskStrings); } @@ -85,7 +85,7 @@ public string AccessMaskFlagsHumanized /// IsInheritedHumanized /// public string IsInheritedHumanized - => IsInherited ? "Yes".GetLocalizedResource() : "No".GetLocalizedResource(); + => IsInherited ? Strings.Yes.GetLocalizedResource() : Strings.No.GetLocalizedResource(); /// /// InheritanceFlagsHumanized @@ -98,13 +98,13 @@ public string InheritanceFlagsHumanized if (AccessControlEntryFlags == AccessControlEntryFlags.None || AccessControlEntryFlags == AccessControlEntryFlags.NoPropagateInherit) - inheritanceStrings.Add("SecurityAdvancedFlagsFolderLabel".GetLocalizedResource()); + inheritanceStrings.Add(Strings.SecurityAdvancedFlagsFolderLabel.GetLocalizedResource()); if (AccessControlEntryFlags.HasFlag(AccessControlEntryFlags.ContainerInherit)) - inheritanceStrings.Add("SecurityAdvancedFlagsSubfoldersLabel".GetLocalizedResource()); + inheritanceStrings.Add(Strings.SecurityAdvancedFlagsSubfoldersLabel.GetLocalizedResource()); if (AccessControlEntryFlags.HasFlag(AccessControlEntryFlags.ObjectInherit)) - inheritanceStrings.Add("SecurityAdvancedFlagsFilesLabel".GetLocalizedResource()); + inheritanceStrings.Add(Strings.SecurityAdvancedFlagsFilesLabel.GetLocalizedResource()); // Capitalize the first letter if (inheritanceStrings.Any()) diff --git a/src/Files.App/Data/Items/AppLanguageItem.cs b/src/Files.App/Data/Items/AppLanguageItem.cs index 5418d8577f85..fe05a9e90e81 100644 --- a/src/Files.App/Data/Items/AppLanguageItem.cs +++ b/src/Files.App/Data/Items/AppLanguageItem.cs @@ -30,7 +30,7 @@ public AppLanguageItem(string code, bool systemDefault = false) if (systemDefault || string.IsNullOrEmpty(code)) { Code = new CultureInfo(code).Name; - Name = "SettingsPreferencesSystemDefaultLanguageOption".GetLocalizedResource(); + Name = Strings.SettingsPreferencesSystemDefaultLanguageOption.GetLocalizedResource(); } else { diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs index a57a3d1b9d39..1bcc0a722879 100644 --- a/src/Files.App/Data/Items/DriveItem.cs +++ b/src/Files.App/Data/Items/DriveItem.cs @@ -219,7 +219,7 @@ public FrameworkElement? ItemDecorator } }; - ToolTipService.SetToolTip(itemDecorator, "Eject".GetLocalizedResource()); + ToolTipService.SetToolTip(itemDecorator, Strings.Eject.GetLocalizedResource()); itemDecorator.Click += ItemDecorator_Click; @@ -296,7 +296,7 @@ public async Task UpdatePropertiesAsync() } else { - SpaceText = "Unknown".GetLocalizedResource(); + SpaceText = Strings.Unknown.GetLocalizedResource(); MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0); } @@ -309,7 +309,7 @@ public async Task UpdatePropertiesAsync() } catch (Exception) { - SpaceText = "Unknown".GetLocalizedResource(); + SpaceText = Strings.Unknown.GetLocalizedResource(); MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0); Filesystem = string.Empty; @@ -353,7 +353,7 @@ public async Task LoadThumbnailAsync() private string GetSizeString() { return string.Format( - "DriveFreeSpaceAndCapacity".GetLocalizedResource(), + Strings.DriveFreeSpaceAndCapacity.GetLocalizedResource(), FreeSpace.ToSizeString(), MaxSpace.ToSizeString()); } diff --git a/src/Files.App/Data/Models/ByteSize.cs b/src/Files.App/Data/Models/ByteSize.cs index 8966245b70db..23301837fa47 100644 --- a/src/Files.App/Data/Models/ByteSize.cs +++ b/src/Files.App/Data/Models/ByteSize.cs @@ -9,13 +9,13 @@ public struct ByteSize : IEquatable, IComparable { private static readonly FrozenDictionary units = new Dictionary { - [ByteSizeLib.ByteSize.BitSymbol] = "ByteSymbol".ToLocalized(), - [ByteSizeLib.ByteSize.ByteSymbol] = "ByteSymbol".ToLocalized(), - [ByteSizeLib.ByteSize.KibiByteSymbol] = "KiloByteSymbol".ToLocalized(), - [ByteSizeLib.ByteSize.MebiByteSymbol] = "MegaByteSymbol".ToLocalized(), - [ByteSizeLib.ByteSize.GibiByteSymbol] = "GigaByteSymbol".ToLocalized(), - [ByteSizeLib.ByteSize.TebiByteSymbol] = "TeraByteSymbol".ToLocalized(), - [ByteSizeLib.ByteSize.PebiByteSymbol] = "PetaByteSymbol".ToLocalized(), + [ByteSizeLib.ByteSize.BitSymbol] = Strings.ByteSymbol.ToLocalized(), + [ByteSizeLib.ByteSize.ByteSymbol] = Strings.ByteSymbol.ToLocalized(), + [ByteSizeLib.ByteSize.KibiByteSymbol] = Strings.KiloByteSymbol.ToLocalized(), + [ByteSizeLib.ByteSize.MebiByteSymbol] = Strings.MegaByteSymbol.ToLocalized(), + [ByteSizeLib.ByteSize.GibiByteSymbol] = Strings.GigaByteSymbol.ToLocalized(), + [ByteSizeLib.ByteSize.TebiByteSymbol] = Strings.TeraByteSymbol.ToLocalized(), + [ByteSizeLib.ByteSize.PebiByteSymbol] = Strings.PetaByteSymbol.ToLocalized(), }.ToFrozenDictionary(); private readonly ByteSizeLib.ByteSize size; diff --git a/src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs b/src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs index abcdb97c09ba..3be81f4b6587 100644 --- a/src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs +++ b/src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs @@ -133,7 +133,7 @@ ContentPageContext.ShellPage is not null && var behind = head is not null ? head.BehindBy ?? 0 : 0; var ahead = head is not null ? head.AheadBy ?? 0 : 0; - ExtendedStatusInfo = string.Format("GitSyncStatusExtendedInfo".GetLocalizedResource(), ahead, behind); + ExtendedStatusInfo = string.Format(Strings.GitSyncStatusExtendedInfo.GetLocalizedResource(), ahead, behind); StatusInfo = $"{ahead} / {behind}"; OnPropertyChanged(nameof(ShowOpenInIDEButton)); diff --git a/src/Files.App/Data/Models/PinnedFoldersManager.cs b/src/Files.App/Data/Models/PinnedFoldersManager.cs index d2e84d1cd57a..3b1c8b11c9ba 100644 --- a/src/Files.App/Data/Models/PinnedFoldersManager.cs +++ b/src/Files.App/Data/Models/PinnedFoldersManager.cs @@ -83,9 +83,9 @@ public async Task CreateLocationItemFromPathAsync(string path) locationItem = LocationItem.Create(); if (path.Equals(Constants.UserEnvironmentPaths.MyComputerPath, StringComparison.OrdinalIgnoreCase)) - locationItem.Text = "ThisPC".GetLocalizedResource(); + locationItem.Text = Strings.ThisPC.GetLocalizedResource(); else if (path.Equals(Constants.UserEnvironmentPaths.NetworkFolderPath, StringComparison.OrdinalIgnoreCase)) - locationItem.Text = "Network".GetLocalizedResource(); + locationItem.Text = Strings.Network.GetLocalizedResource(); } locationItem.Path = path;