Fix: Fixed an issue where pin/unpin string is not shown (#14869)

0x5bfa · web-flow · commit 546cd6469fd8 · 2024-02-29T08:28:41.000-08:00
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -145,7 +145,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToSidebar".GetLocalizedResource(),
+					Text = "PinFolderToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Pin.16x16",
@@ -156,7 +156,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromSidebar".GetLocalizedResource(),
+					Text = "UnpinFolderFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Unpin.16x16",
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -204,7 +204,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToSidebar".GetLocalizedResource(),
+					Text = "PinFolderToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Pin.16x16",
@@ -215,7 +215,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromSidebar".GetLocalizedResource(),
+					Text = "UnpinFolderFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Unpin.16x16",
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -98,7 +98,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToSidebar".GetLocalizedResource(),
+					Text = "PinFolderToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Pin.16x16",
@@ -109,7 +109,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromSidebar".GetLocalizedResource(),
+					Text = "UnpinFolderFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Unpin.16x16",
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -1002,7 +1002,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToSidebar".GetLocalizedResource(),
+					Text = "PinFolderToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Pin.16x16",
@@ -1012,7 +1012,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromSidebar".GetLocalizedResource(),
+					Text = "UnpinFolderFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
 						OpacityIconStyle = "Icons.Unpin.16x16",
@@ -1109,7 +1109,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 					}
 					else
 					{
-						var captionText = "PinToSidebar".GetLocalizedResource();
+						var captionText = "PinFolderToSidebar".GetLocalizedResource();
 						CompleteDragEventArgs(rawEvent, captionText, DataPackageOperation.Move);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`145`	`145`	`},`
`146`	`146`	`new ContextMenuFlyoutItemViewModel()`
`147`	`147`	`{`
`148`		`- Text = "PinToSidebar".GetLocalizedResource(),`
	`148`	`+ Text = "PinFolderToSidebar".GetLocalizedResource(),`
`149`	`149`	`OpacityIcon = new OpacityIconModel()`
`150`	`150`	`{`
`151`	`151`	`OpacityIconStyle = "Icons.Pin.16x16",`
`@@ -156,7 +156,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`156`	`156`	`},`
`157`	`157`	`new ContextMenuFlyoutItemViewModel()`
`158`	`158`	`{`
`159`		`- Text = "UnpinFromSidebar".GetLocalizedResource(),`
	`159`	`+ Text = "UnpinFolderFromSidebar".GetLocalizedResource(),`
`160`	`160`	`OpacityIcon = new OpacityIconModel()`
`161`	`161`	`{`
`162`	`162`	`OpacityIconStyle = "Icons.Unpin.16x16",`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`204`	`204`	`},`
`205`	`205`	`new ContextMenuFlyoutItemViewModel()`
`206`	`206`	`{`
`207`		`- Text = "PinToSidebar".GetLocalizedResource(),`
	`207`	`+ Text = "PinFolderToSidebar".GetLocalizedResource(),`
`208`	`208`	`OpacityIcon = new OpacityIconModel()`
`209`	`209`	`{`
`210`	`210`	`OpacityIconStyle = "Icons.Pin.16x16",`
`@@ -215,7 +215,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`215`	`215`	`},`
`216`	`216`	`new ContextMenuFlyoutItemViewModel()`
`217`	`217`	`{`
`218`		`- Text = "UnpinFromSidebar".GetLocalizedResource(),`
	`218`	`+ Text = "UnpinFolderFromSidebar".GetLocalizedResource(),`
`219`	`219`	`OpacityIcon = new OpacityIconModel()`
`220`	`220`	`{`
`221`	`221`	`OpacityIconStyle = "Icons.Unpin.16x16",`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`98`	`98`	`},`
`99`	`99`	`new ContextMenuFlyoutItemViewModel()`
`100`	`100`	`{`
`101`		`- Text = "PinToSidebar".GetLocalizedResource(),`
	`101`	`+ Text = "PinFolderToSidebar".GetLocalizedResource(),`
`102`	`102`	`OpacityIcon = new OpacityIconModel()`
`103`	`103`	`{`
`104`	`104`	`OpacityIconStyle = "Icons.Pin.16x16",`
`@@ -109,7 +109,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`109`	`109`	`},`
`110`	`110`	`new ContextMenuFlyoutItemViewModel()`
`111`	`111`	`{`
`112`		`- Text = "UnpinFromSidebar".GetLocalizedResource(),`
	`112`	`+ Text = "UnpinFolderFromSidebar".GetLocalizedResource(),`
`113`	`113`	`OpacityIcon = new OpacityIconModel()`
`114`	`114`	`{`
`115`	`115`	`OpacityIconStyle = "Icons.Unpin.16x16",`
Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio`
`1002`	`1002`	`},`
`1003`	`1003`	`new ContextMenuFlyoutItemViewModel()`
`1004`	`1004`	`{`
`1005`		`- Text = "PinToSidebar".GetLocalizedResource(),`
	`1005`	`+ Text = "PinFolderToSidebar".GetLocalizedResource(),`
`1006`	`1006`	`OpacityIcon = new OpacityIconModel()`
`1007`	`1007`	`{`
`1008`	`1008`	`OpacityIconStyle = "Icons.Pin.16x16",`
`@@ -1012,7 +1012,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio`
`1012`	`1012`	`},`
`1013`	`1013`	`new ContextMenuFlyoutItemViewModel()`
`1014`	`1014`	`{`
`1015`		`- Text = "UnpinFromSidebar".GetLocalizedResource(),`
	`1015`	`+ Text = "UnpinFolderFromSidebar".GetLocalizedResource(),`
`1016`	`1016`	`OpacityIcon = new OpacityIconModel()`
`1017`	`1017`	`{`
`1018`	`1018`	`OpacityIconStyle = "Icons.Unpin.16x16",`
`@@ -1109,7 +1109,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It`
`1109`	`1109`	`}`
`1110`	`1110`	`else`
`1111`	`1111`	`{`
`1112`		`- var captionText = "PinToSidebar".GetLocalizedResource();`
	`1112`	`+ var captionText = "PinFolderToSidebar".GetLocalizedResource();`
`1113`	`1113`	`CompleteDragEventArgs(rawEvent, captionText, DataPackageOperation.Move);`
`1114`	`1114`	`}`
`1115`	`1115`	`}`