Code Quality: Improved display of singular and plural strings (#17036)

yaira2 · web-flow · commit e993f5ef1eae · 2025-04-10T11:26:09.000-04:00
diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs
@@ -13,7 +13,7 @@ public override string Label
 			=> Strings.CreateArchive.GetLocalizedResource();
 
 		public override string Description
-			=> Strings.CompressIntoArchiveDescription.GetLocalizedResource();
+			=> Strings.CompressIntoArchiveDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public CompressIntoArchiveAction()
 		{
diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoSevenZipAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoSevenZipAction.cs
@@ -9,7 +9,7 @@ public override string Label
 			=> string.Format(Strings.CreateNamedArchive.GetLocalizedResource(), $"{StorageArchiveService.GenerateArchiveNameFromItems(context.SelectedItems)}.7z");
 
 		public override string Description
-			=> Strings.CompressIntoSevenZipDescription.GetLocalizedResource();
+			=> Strings.CompressIntoSevenZipDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public CompressIntoSevenZipAction()
 		{
diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoZipAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoZipAction.cs
@@ -9,7 +9,7 @@ public override string Label
 			=> string.Format(Strings.CreateNamedArchive.GetLocalizedResource(), $"{StorageArchiveService.GenerateArchiveNameFromItems(context.SelectedItems)}.zip");
 
 		public override string Description
-			=> Strings.CompressIntoZipDescription.GetLocalizedResource();
+			=> Strings.CompressIntoZipDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public CompressIntoZipAction()
 		{
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
@@ -17,7 +17,7 @@ public override string Label
 			=> Strings.ExtractFiles.GetLocalizedResource();
 
 		public override string Description
-			=> Strings.DecompressArchiveDescription.GetLocalizedResource();
+			=> Strings.DecompressArchiveDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public override HotKey HotKey
 			=> new(Keys.E, KeyModifiers.Ctrl);
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHere.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHere.cs
@@ -9,7 +9,7 @@ public override string Label
 			=> Strings.ExtractHere.GetLocalizedResource();
 
 		public override string Description
-			=> Strings.DecompressArchiveHereDescription.GetLocalizedResource();
+			=> Strings.DecompressArchiveHereDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public DecompressArchiveHere()
 		{
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHereSmart.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHereSmart.cs
@@ -9,7 +9,7 @@ public override string Label
 			=> Strings.ExtractHereSmart.GetLocalizedResource();
 
 		public override string Description
-			=> Strings.DecompressArchiveHereSmartDescription.GetLocalizedResource();
+			=> Strings.DecompressArchiveHereSmartDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public override HotKey HotKey
 			=> new(Keys.E, KeyModifiers.CtrlShift);
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs
@@ -15,7 +15,7 @@ public override string Label
 			=> ComputeLabel();
 
 		public override string Description
-			=> Strings.DecompressArchiveToChildFolderDescription.GetLocalizedResource();
+			=> Strings.DecompressArchiveToChildFolderDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public DecompressArchiveToChildFolderAction()
 		{
diff --git a/src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs b/src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs
@@ -8,7 +8,7 @@ namespace Files.App.Actions
 {
 	internal abstract class BaseRotateAction : ObservableObject, IAction
 	{
-		private readonly IContentPageContext context;
+		protected readonly IContentPageContext context;
 
 		private readonly InfoPaneViewModel _infoPaneViewModel;
 
diff --git a/src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs b/src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs
@@ -11,7 +11,7 @@ public override string Label
 			=> Strings.RotateLeft.GetLocalizedResource();
 
 		public override string Description
-			=> Strings.RotateLeftDescription.GetLocalizedResource();
+			=> Strings.RotateLeftDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public override RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.ACW");
diff --git a/src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs b/src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs
@@ -11,7 +11,7 @@ public override string Label
 			=> Strings.RotateRight.GetLocalizedResource();
 
 		public override string Description
-			=> Strings.RotateRightDescription.GetLocalizedResource();
+			=> Strings.RotateRightDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public override RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.CW");
diff --git a/src/Files.App/Actions/Content/Install/InstallCertificateAction.cs b/src/Files.App/Actions/Content/Install/InstallCertificateAction.cs
@@ -13,7 +13,7 @@ public string Label
 			=> Strings.Install.GetLocalizedResource();
 
 		public string Description
-			=> Strings.InstallCertificateDescription.GetLocalizedResource();
+			=> Strings.InstallCertificateDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new("\uEB95");
diff --git a/src/Files.App/Actions/Content/Install/InstallFontAction.cs b/src/Files.App/Actions/Content/Install/InstallFontAction.cs
@@ -14,7 +14,7 @@ public string Label
 			=> Strings.Install.GetLocalizedResource();
 
 		public string Description
-			=> Strings.InstallFontDescription.GetLocalizedResource();
+			=> Strings.InstallFontDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.Actions.FontInstall");
diff --git a/src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs b/src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs
@@ -13,7 +13,7 @@ public string Label
 			=> Strings.Install.GetLocalizedResource();
 		
 		public string Description
-			=> Strings.InstallInfDriverDescription.GetLocalizedResource();
+			=> Strings.InstallInfDriverDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new("\uE9F5");
diff --git a/src/Files.App/Actions/Content/Share/ShareItemAction.cs b/src/Files.App/Actions/Content/Share/ShareItemAction.cs
@@ -13,7 +13,7 @@ public string Label
 			=> Strings.Share.GetLocalizedResource();
 
 		public string Description
-			=> Strings.ShareItemDescription.GetLocalizedResource();
+			=> Strings.ShareItemDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.Share");
diff --git a/src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs b/src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs
@@ -17,7 +17,7 @@ public string Label
 			=> Strings.CreateAlternateDataStream.GetLocalizedResource();
 
 		public string Description
-			=> Strings.CreateAlternateDataStreamDescription.GetLocalizedResource();
+			=> Strings.CreateAlternateDataStreamDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new RichGlyph(themedIconStyle: "App.ThemedIcons.AltDataStream");
diff --git a/src/Files.App/Actions/FileSystem/CreateFolderWithSelectionAction.cs b/src/Files.App/Actions/FileSystem/CreateFolderWithSelectionAction.cs
@@ -11,7 +11,7 @@ public string Label
 			=> Strings.CreateFolderWithSelection.GetLocalizedResource();
 
 		public string Description
-			=> Strings.CreateFolderWithSelectionDescription.GetLocalizedResource();
+			=> Strings.CreateFolderWithSelectionDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.New.Folder");
diff --git a/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs b/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs
@@ -11,7 +11,7 @@ public string Label
 			=> Strings.CreateShortcut.GetLocalizedResource();
 
 		public string Description
-			=> Strings.CreateShortcutDescription.GetLocalizedResource();
+			=> Strings.CreateShortcutDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.URL");
diff --git a/src/Files.App/Actions/FileSystem/DeleteItemAction.cs b/src/Files.App/Actions/FileSystem/DeleteItemAction.cs
@@ -9,7 +9,7 @@ public string Label
 			=> Strings.Delete.GetLocalizedResource();
 
 		public string Description
-			=> Strings.DeleteItemDescription.GetLocalizedResource();
+			=> Strings.DeleteItemDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new RichGlyph(themedIconStyle: "App.ThemedIcons.Delete");
diff --git a/src/Files.App/Actions/FileSystem/DeleteItemPermanentlyAction.cs b/src/Files.App/Actions/FileSystem/DeleteItemPermanentlyAction.cs
@@ -9,7 +9,7 @@ public string Label
 			=> Strings.DeletePermanently.GetLocalizedResource();
 
 		public string Description
-			=> Strings.DeleteItemPermanentlyDescription.GetLocalizedResource();
+			=> Strings.DeleteItemPermanentlyDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public HotKey HotKey
 			=> new(Keys.Delete, KeyModifiers.Shift);
diff --git a/src/Files.App/Actions/FileSystem/OpenItemAction.cs b/src/Files.App/Actions/FileSystem/OpenItemAction.cs
@@ -14,8 +14,8 @@ public string Label
 			=> Strings.Open.GetLocalizedResource();
 
 		public string Description
-			=> Strings.OpenItemDescription.GetLocalizedResource();
-
+			=> Strings.OpenItemDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
+			
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.OpenFile");
 
@@ -58,7 +58,7 @@ public string Label
 			=> Strings.OpenWith.GetLocalizedResource();
 
 		public string Description
-			=> Strings.OpenItemWithApplicationPickerDescription.GetLocalizedResource();
+			=> Strings.OpenItemWithApplicationPickerDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.OpenWith");
diff --git a/src/Files.App/Actions/FileSystem/PasteItemAction.cs b/src/Files.App/Actions/FileSystem/PasteItemAction.cs
@@ -1,14 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Data.Models;
-using Files.App.Extensions;
-using Files.App.Helpers;
-using System.ComponentModel;
-using System.Threading.Tasks;
-
 namespace Files.App.Actions
 {
 	internal sealed partial class PasteItemAction : ObservableObject, IAction
diff --git a/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs b/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs
@@ -15,7 +15,7 @@ public string Label
 			=> Strings.Restore.GetLocalizedResource();
 
 		public string Description
-			=> Strings.RestoreRecycleBinDescription.GetLocalizedResource();
+			=> Strings.RestoreRecycleBinDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.RestoreDeleted");
@@ -37,7 +37,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			var confirmationDialog = new ContentDialog()
 			{
 				Title = Strings.ConfirmRestoreSelectionBinDialogTitle.GetLocalizedResource(),
-				Content = string.Format(Strings.ConfirmRestoreSelectionBinDialogContent.GetLocalizedResource(), context.SelectedItems.Count),
+				Content = string.Format(Strings.ConfirmRestoreSelectionBinDialogContent.GetLocalizedFormatResource(context.SelectedItems.Count), context.SelectedItems.Count),
 				PrimaryButtonText = Strings.Yes.GetLocalizedResource(),
 				SecondaryButtonText = Strings.Cancel.GetLocalizedResource(),
 				DefaultButton = ContentDialogButton.Primary
diff --git a/src/Files.App/Actions/FileSystem/Transfer/CopyItemAction.cs b/src/Files.App/Actions/FileSystem/Transfer/CopyItemAction.cs
@@ -11,7 +11,7 @@ public string Label
 			=> Strings.Copy.GetLocalizedResource();
 
 		public string Description
-			=> Strings.CopyItemDescription.GetLocalizedResource();
+			=> Strings.CopyItemDescription.GetLocalizedFormatResource(ContentPageContext.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.Copy");
diff --git a/src/Files.App/Actions/FileSystem/Transfer/CutItemAction.cs b/src/Files.App/Actions/FileSystem/Transfer/CutItemAction.cs
@@ -11,7 +11,7 @@ public string Label
 			=> Strings.Cut.GetLocalizedResource();
 
 		public string Description
-			=> Strings.CutItemDescription.GetLocalizedResource();
+			=> Strings.CutItemDescription.GetLocalizedFormatResource(ContentPageContext.SelectedItems.Count);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.Cut");
diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -14,7 +14,7 @@ public string Label
 			=> Strings.PinFolderToSidebar.GetLocalizedResource();
 
 		public string Description
-			=> Strings.PinFolderToSidebarDescription.GetLocalizedResource();
+			=> Strings.PinFolderToSidebarDescription.GetLocalizedFormatResource(context.HasSelection ? context.SelectedItems.Count : 1);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.FavoritePin");
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -12,7 +12,7 @@ public string Label
 			=> Strings.UnpinFolderFromSidebar.GetLocalizedResource();
 
 		public string Description
-			=> Strings.UnpinFolderFromSidebarDescription.GetLocalizedResource();
+			=> Strings.UnpinFolderFromSidebarDescription.GetLocalizedFormatResource(context.HasSelection ? context.SelectedItems.Count : 1);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.FavoritePinRemove");
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -15,7 +15,7 @@ public string Label
 			=> Strings.PinItemToStart_Text.GetLocalizedResource();
 
 		public string Description
-			=> Strings.PinToStartDescription.GetLocalizedResource();
+			=> Strings.PinToStartDescription.GetLocalizedFormatResource(context.HasSelection ? context.SelectedItems.Count : 1);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.FavoritePin");
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -15,7 +15,7 @@ public string Label
 			=> Strings.UnpinItemFromStart_Text.GetLocalizedResource();
 
 		public string Description
-			=> Strings.UnpinFromStartDescription.GetLocalizedResource();
+			=> Strings.UnpinFromStartDescription.GetLocalizedFormatResource(context.HasSelection ? context.SelectedItems.Count : 1);
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.FavoritePinRemove");
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
diff --git a/src/Files.App/Utils/StatusCenter/StatusCenterItem.cs b/src/Files.App/Utils/StatusCenter/StatusCenterItem.cs

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public override string Label`
`13`	`13`	`=> Strings.CreateArchive.GetLocalizedResource();`
`14`	`14`
`15`	`15`	`public override string Description`
`16`		`- => Strings.CompressIntoArchiveDescription.GetLocalizedResource();`
	`16`	`+ => Strings.CompressIntoArchiveDescription.GetLocalizedFormatResource(context.SelectedItems.Count);`
`17`	`17`
`18`	`18`	`public CompressIntoArchiveAction()`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public override string Label`
`9`	`9`	`=> string.Format(Strings.CreateNamedArchive.GetLocalizedResource(), $"{StorageArchiveService.GenerateArchiveNameFromItems(context.SelectedItems)}.7z");`
`10`	`10`
`11`	`11`	`public override string Description`
`12`		`- => Strings.CompressIntoSevenZipDescription.GetLocalizedResource();`
	`12`	`+ => Strings.CompressIntoSevenZipDescription.GetLocalizedFormatResource(context.SelectedItems.Count);`
`13`	`13`
`14`	`14`	`public CompressIntoSevenZipAction()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public override string Label`
`9`	`9`	`=> Strings.ExtractHere.GetLocalizedResource();`
`10`	`10`
`11`	`11`	`public override string Description`
`12`		`- => Strings.DecompressArchiveHereDescription.GetLocalizedResource();`
	`12`	`+ => Strings.DecompressArchiveHereDescription.GetLocalizedFormatResource(context.SelectedItems.Count);`
`13`	`13`
`14`	`14`	`public DecompressArchiveHere()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public override string Label`
`15`	`15`	`=> ComputeLabel();`
`16`	`16`
`17`	`17`	`public override string Description`
`18`		`- => Strings.DecompressArchiveToChildFolderDescription.GetLocalizedResource();`
	`18`	`+ => Strings.DecompressArchiveToChildFolderDescription.GetLocalizedFormatResource(context.SelectedItems.Count);`
`19`	`19`
`20`	`20`	`public DecompressArchiveToChildFolderAction()`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Files.App.Actions`
`8`	`8`	`{`
`9`	`9`	`internal abstract class BaseRotateAction : ObservableObject, IAction`
`10`	`10`	`{`
`11`		`- private readonly IContentPageContext context;`
	`11`	`+ protected readonly IContentPageContext context;`
`12`	`12`
`13`	`13`	`private readonly InfoPaneViewModel _infoPaneViewModel;`
`14`	`14`