From 894428ab9d20a17d5eb2493a33bfbe937188cc45 Mon Sep 17 00:00:00 2001
From: Scott Whitney <79826944+puppetsw@users.noreply.github.com>
Date: Wed, 2 Feb 2022 12:19:35 +1030
Subject: [PATCH 1/4] Added missing resource string for Sidebar Documents
---
src/Files/Strings/en-US/Resources.resw | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/Files/Strings/en-US/Resources.resw b/src/Files/Strings/en-US/Resources.resw
index 5a20fd825ad5..42dd225c8b82 100644
--- a/src/Files/Strings/en-US/Resources.resw
+++ b/src/Files/Strings/en-US/Resources.resw
@@ -2744,4 +2744,7 @@ We use App Center to track which settings are being used, find bugs, and fix cra
Close other tabs
-
+
+ Documents
+
+
\ No newline at end of file
From 482038ae11ae8f9ec49182e8605261bca24f6f2f Mon Sep 17 00:00:00 2001
From: Scott Whitney <79826944+puppetsw@users.noreply.github.com>
Date: Wed, 2 Feb 2022 16:59:58 +1030
Subject: [PATCH 2/4] Simplified way resource strings for libraries are found.
---
src/Files/Strings/en-US/Resources.resw | 9 ++++++++
src/Files/ViewModels/MainPageViewModel.cs | 26 +++--------------------
2 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/src/Files/Strings/en-US/Resources.resw b/src/Files/Strings/en-US/Resources.resw
index 42dd225c8b82..cfec690b24a8 100644
--- a/src/Files/Strings/en-US/Resources.resw
+++ b/src/Files/Strings/en-US/Resources.resw
@@ -2747,4 +2747,13 @@ We use App Center to track which settings are being used, find bugs, and fix cra
Documents
+
+ Music
+
+
+ Pictures
+
+
+ Videos
+
\ No newline at end of file
diff --git a/src/Files/ViewModels/MainPageViewModel.cs b/src/Files/ViewModels/MainPageViewModel.cs
index ec7f7f4e2187..7e0f0910d189 100644
--- a/src/Files/ViewModels/MainPageViewModel.cs
+++ b/src/Files/ViewModels/MainPageViewModel.cs
@@ -288,29 +288,9 @@ public static async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
}
else if (App.LibraryManager.TryGetLibrary(currentPath, out LibraryLocationItem library))
{
- var libName = System.IO.Path.GetFileNameWithoutExtension(library.Path);
- switch (libName)
- {
- case "Documents":
- tabLocationHeader = $"Sidebar{libName}".GetLocalized(); // Show localized name
- break;
-
- case "Pictures":
- tabLocationHeader = $"Sidebar{libName}".GetLocalized(); // Show localized name
- break;
-
- case "Music":
- tabLocationHeader = $"Sidebar{libName}".GetLocalized(); // Show localized name
- break;
-
- case "Videos":
- tabLocationHeader = $"Sidebar{libName}".GetLocalized(); // Show localized name
- break;
-
- default:
- tabLocationHeader = library.Text; // Show original name
- break;
- }
+ var libName = System.IO.Path.GetFileNameWithoutExtension(library.Path).GetLocalized();
+ // If localized string is empty use the library name.
+ tabLocationHeader = string.IsNullOrEmpty(libName) ? library.Text : libName;
}
else
{
From 68a30849b0ba05a336f6c1d1824b7157b9d7a340 Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:24:32 -0500
Subject: [PATCH 3/4] Update src/Files/Strings/en-US/Resources.resw
---
src/Files/Strings/en-US/Resources.resw | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Files/Strings/en-US/Resources.resw b/src/Files/Strings/en-US/Resources.resw
index cfec690b24a8..441c9d3dcbbe 100644
--- a/src/Files/Strings/en-US/Resources.resw
+++ b/src/Files/Strings/en-US/Resources.resw
@@ -2744,7 +2744,7 @@ We use App Center to track which settings are being used, find bugs, and fix cra
Close other tabs
-
+
Documents
From ad583c0f1a66e26b38f6575fda8f0795f8ad4721 Mon Sep 17 00:00:00 2001
From: Scott Whitney <79826944+puppetsw@users.noreply.github.com>
Date: Thu, 3 Feb 2022 08:47:02 +1030
Subject: [PATCH 4/4] Removed SidebarHome, Videos, Pictures and Music, removed
duplicated Documents string.
Updated references to SidebarHome etc in FolderWidget and PreferencesViewModel
---
src/Files/Strings/en-US/Resources.resw | 17 +----------------
.../UserControls/Widgets/FolderWidget.xaml.cs | 6 +++---
.../SettingsViewModels/PreferencesViewModel.cs | 4 ++--
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/Files/Strings/en-US/Resources.resw b/src/Files/Strings/en-US/Resources.resw
index 441c9d3dcbbe..0b36d83849ac 100644
--- a/src/Files/Strings/en-US/Resources.resw
+++ b/src/Files/Strings/en-US/Resources.resw
@@ -1,4 +1,4 @@
-
+