Skip to content

Fix: Fixed "NotAFolder" error when changing the language #11232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2023
Merged

Fix: Fixed "NotAFolder" error when changing the language #11232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Files.App/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public static void SaveSessionTabs() // Enumerates through all tabs and gets the
}
else
{
var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "Home".GetLocalizedResource() };
var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "Home" };
return defaultArg.Serialize();
}
}).ToList();
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public string Path
set
{
path = value;
ToolTipText = string.IsNullOrEmpty(Path) || Path.Contains('?', StringComparison.Ordinal) || Path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) || Path.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase) || Path == "Home".GetLocalizedResource() ? Text : Path;
ToolTipText = string.IsNullOrEmpty(Path) || Path.Contains('?', StringComparison.Ordinal) || Path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) || Path.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase) || Path == "Home" ? Text : Path;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/Filesystem/Search/FolderSearch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public Task SearchAsync(IList<ListedItem> results, CancellationToken token)
{
return AddItemsAsyncForLibrary(library, results, token);
}
else if (Folder == "Home".GetLocalizedResource())
else if (Folder == "Home")
{
return AddItemsAsyncForHome(results, token);
}
Expand Down Expand Up @@ -119,7 +119,7 @@ public async Task<ObservableCollection<ListedItem>> SearchAsync()
{
await AddItemsAsyncForLibrary(library, results, token);
}
else if (Folder == "Home".GetLocalizedResource())
else if (Folder == "Home")
{
await AddItemsAsyncForHome(results, token);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Helpers/CommonPaths.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public static class CommonPaths

public static Dictionary<string, string> ShellPlaces = new Dictionary<string, string>() {
{ "::{645FF040-5081-101B-9F08-00AA002F954E}", RecycleBinPath },
{ "::{5E5F29CE-E0A8-49D3-AF32-7A7BDC173478}", "Home".GetLocalizedResource() /*MyComputerPath*/ },
{ "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "Home".GetLocalizedResource() /*MyComputerPath*/ },
{ "::{5E5F29CE-E0A8-49D3-AF32-7A7BDC173478}", "Home" /*MyComputerPath*/ },
{ "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "Home" /*MyComputerPath*/ },
{ "::{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}", NetworkFolderPath },
{ "::{208D2C60-3AEA-1069-A2D7-08002B30309D}", NetworkFolderPath },
{ RecycleBinPath.ToUpperInvariant(), RecycleBinPath },
{ MyComputerPath.ToUpperInvariant(), "Home".GetLocalizedResource() /*MyComputerPath*/ },
{ MyComputerPath.ToUpperInvariant(), "Home" /*MyComputerPath*/ },
{ NetworkFolderPath.ToUpperInvariant(), NetworkFolderPath },
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/MultitaskingTabsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static Task MoveTabToNewWindow(TabItem tab, IMultitaskingControl multitas

return tabItemArguments is not null
? NavigationHelpers.OpenTabInNewWindowAsync(tabItemArguments.Serialize())
: NavigationHelpers.OpenPathInNewWindowAsync("Home".GetLocalizedResource());
: NavigationHelpers.OpenPathInNewWindowAsync("Home");
}

public static async Task AddNewTab(Type type, object tabViewItemArgs, int atIndex = -1)
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/NavigationHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public static async Task<bool> OpenPath(string path, IShellPage associatedInstan
associatedInstance.NavigateToPath(path, new NavigationArguments()
{
IsSearchResultPage = true,
SearchPathParam = "Home".GetLocalizedResource(),
SearchPathParam = "Home",
SearchQuery = path,
AssociatedTabInstance = associatedInstance,
NavPathParam = path
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/UserControls/SidebarControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ private async void NavigationViewLocationItem_DragOver(object sender, DragEventA
}
else if (isPathNull ||
(hasStorageItems && storageItems.AreItemsAlreadyInFolder(locationItem.Path)) ||
locationItem.Path.StartsWith("Home".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
locationItem.Path.StartsWith("Home", StringComparison.OrdinalIgnoreCase))
{
e.AcceptedOperation = DataPackageOperation.None;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/ViewModels/ItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public async Task SetWorkingDirectoryAsync(string? value)
else if (!Path.IsPathRooted(WorkingDirectory) || Path.GetPathRoot(WorkingDirectory) != Path.GetPathRoot(value))
workingRoot = await FilesystemTasks.Wrap(() => DrivesManager.GetRootFromPathAsync(value));

if (value == "Home".GetLocalizedResource())
if (value == "Home")
currentStorageFolder = null;
else
App.JumpList.AddFolderToJumpList(value);
Expand Down Expand Up @@ -458,7 +458,7 @@ private async void FileTagsSettingsService_OnSettingImportedEvent(object? sender
{
await dispatcherQueue.EnqueueAsync(() =>
{
if (WorkingDirectory != "Home".GetLocalizedResource())
if (WorkingDirectory != "Home")
RefreshItems(null);
});
}
Expand All @@ -477,7 +477,7 @@ private async void UserSettingsService_OnSettingChangedEvent(object? sender, Set
case nameof(UserSettingsService.FoldersSettingsService.SelectFilesOnHover):
await dispatcherQueue.EnqueueAsync(() =>
{
if (WorkingDirectory != "Home".GetLocalizedResource())
if (WorkingDirectory != "Home")
RefreshItems(null);
});
break;
Expand Down
10 changes: 5 additions & 5 deletions src/Files.App/ViewModels/MainPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private async void OpenSettings()
public static async Task AddNewTabByPathAsync(Type type, string? path, int atIndex = -1)
{
if (string.IsNullOrEmpty(path))
path = "Home".GetLocalizedResource();
path = "Home";
else if (path.EndsWith("\\?")) // Support drives launched through jump list by stripping away the question mark at the end.
path = path.Remove(path.Length - 1);

Expand Down Expand Up @@ -254,7 +254,7 @@ public static async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
var iconSource = new Microsoft.UI.Xaml.Controls.ImageIconSource();
string toolTipText = currentPath;

if (string.IsNullOrEmpty(currentPath) || currentPath == "Home".GetLocalizedResource())
if (string.IsNullOrEmpty(currentPath) || currentPath == "Home")
{
tabLocationHeader = "Home".GetLocalizedResource();
iconSource.ImageSource = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage(new Uri(Constants.FluentIconsPaths.HomeIcon));
Expand Down Expand Up @@ -372,7 +372,7 @@ public async void OnNavigatedTo(NavigationEventArgs e)
var tabArgs = TabItemArguments.Deserialize(tabArgsString);
await AddNewTabByParam(tabArgs.InitialPageType, tabArgs.NavigationArg);
}
var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "Home".GetLocalizedResource() };
var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "Home" };
userSettingsService.PreferencesSettingsService.LastSessionTabList = new List<string> { defaultArg.Serialize() };
}
else
Expand Down Expand Up @@ -402,7 +402,7 @@ public async void OnNavigatedTo(NavigationEventArgs e)

public static Task AddNewTabAsync()
{
return AddNewTabByPathAsync(typeof(PaneHolderPage), "Home".GetLocalizedResource());
return AddNewTabByPathAsync(typeof(PaneHolderPage), "Home");
}

public void AddNewTab()
Expand All @@ -427,7 +427,7 @@ public static async void DuplicateTabAtIndex(object sender, RoutedEventArgs e)
}
else
{
await AddNewTabByPathAsync(typeof(PaneHolderPage), "Home".GetLocalizedResource());
await AddNewTabByPathAsync(typeof(PaneHolderPage), "Home");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private async Task InitStartupSettingsRecentFoldersFlyout()
recentsItem.Items.Add(new MenuFlyoutItemViewModel("Home".GetLocalizedResource())
{
Command = AddPageCommand,
CommandParameter = "Home".GetLocalizedResource(),
CommandParameter = "Home",
Tooltip = "Home".GetLocalizedResource()
});
await PopulateRecentItems(recentsItem);
Expand Down Expand Up @@ -631,7 +631,7 @@ public string Text
{
get
{
if (Path == "Home".GetLocalizedResource())
if (Path == "Home")
return "Home".GetLocalizedResource();
return (Path == CommonPaths.RecycleBinPath)
? ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin")
Expand Down
8 changes: 4 additions & 4 deletions src/Files.App/ViewModels/SidebarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ public void UpdateSidebarSelectedItemFromArgs(string arg)

if (string.IsNullOrEmpty(value))
{
//SidebarSelectedItem = sidebarItems.FirstOrDefault(x => x.Path.Equals("Home".GetLocalizedResource()));
//SidebarSelectedItem = sidebarItems.FirstOrDefault(x => x.Path.Equals("Home"));
return;
}

item = sidebarItems.FirstOrDefault(x => x.Path.Equals(value, StringComparison.OrdinalIgnoreCase));
item ??= sidebarItems.FirstOrDefault(x => x.Path.Equals(value + "\\", StringComparison.OrdinalIgnoreCase));
item ??= sidebarItems.FirstOrDefault(x => value.StartsWith(x.Path, StringComparison.OrdinalIgnoreCase));
item ??= sidebarItems.FirstOrDefault(x => x.Path.Equals(Path.GetPathRoot(value), StringComparison.OrdinalIgnoreCase));
if (item is null && value == "Home".GetLocalizedResource())
item = sidebarItems.FirstOrDefault(x => x.Path.Equals("Home".GetLocalizedResource()));
if (item is null && value == "Home")
item = sidebarItems.FirstOrDefault(x => x.Path.Equals("Home"));

if (SidebarSelectedItem != item)
SidebarSelectedItem = item;
Expand Down Expand Up @@ -382,7 +382,7 @@ private async Task<LocationItem> CreateSection(SectionType sectionType)
case SectionType.Home:
{
section = BuildSection("Home".GetLocalizedResource(), sectionType, new ContextMenuOptions { IsLocationItem = true }, true);
section.Path = "Home".GetLocalizedResource();
section.Path = "Home";
section.Font = App.AppModel.SymbolFontFamily;
section.Icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.HomeIcon));
break;
Expand Down
8 changes: 4 additions & 4 deletions src/Files.App/ViewModels/ToolbarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ private void FolderSettings_LayoutPreferencesUpdateRequired(object? sender, obje
public void PathBoxItem_DragLeave(object sender, DragEventArgs e)
{
if (((StackPanel)sender).DataContext is not PathBoxItem pathBoxItem ||
pathBoxItem.Path == "Home".GetLocalizedResource())
pathBoxItem.Path == "Home")
{
return;
}
Expand All @@ -582,7 +582,7 @@ public async void PathBoxItem_Drop(object sender, DragEventArgs e)
dragOverPath = null; // Reset dragged over pathbox item

if (((StackPanel)sender).DataContext is not PathBoxItem pathBoxItem ||
pathBoxItem.Path == "Home".GetLocalizedResource())
pathBoxItem.Path == "Home")
{
return;
}
Expand All @@ -608,7 +608,7 @@ public async void PathBoxItem_DragOver(object sender, DragEventArgs e)
{
if (IsSingleItemOverride ||
((StackPanel)sender).DataContext is not PathBoxItem pathBoxItem ||
pathBoxItem.Path == "Home".GetLocalizedResource())
pathBoxItem.Path == "Home")
{
return;
}
Expand Down Expand Up @@ -988,7 +988,7 @@ public async Task CheckPathInput(string currentInput, string currentSelectedPath

if (currentInput != shellPage.FilesystemViewModel.WorkingDirectory || shellPage.CurrentPageType == typeof(WidgetsPage))
{
if (currentInput.Equals("Home".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
if (currentInput.Equals("Home", StringComparison.OrdinalIgnoreCase) || currentInput.Equals("Home".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
{
shellPage.NavigateHome();
}
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Views/ColumnShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public ColumnShellPage()
FlowDirection = FlowDirection.RightToLeft;
}

//NavigationToolbar.PathControlDisplayText = "Home".GetLocalizedResource();
//NavigationToolbar.PathControlDisplayText = "Home";
//NavigationToolbar.CanGoBack = false;
//NavigationToolbar.CanGoForward = false;
//NavigationToolbar.SearchBox.QueryChanged += ColumnShellPage_QueryChanged;
Expand Down Expand Up @@ -279,7 +279,7 @@ private void InitToolbarCommands()
ToolbarViewModel.ClearContentPageSelectionCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.ClearSelection());
ToolbarViewModel.PasteItemsFromClipboardCommand = new RelayCommand(async () => await UIFilesystemHelpers.PasteItemAsync(FilesystemViewModel.WorkingDirectory, this));
ToolbarViewModel.OpenNewWindowCommand = new AsyncRelayCommand(NavigationHelpers.LaunchNewWindowAsync);
ToolbarViewModel.OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("Home".GetLocalizedResource()));
ToolbarViewModel.OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("Home"));
ToolbarViewModel.ClosePaneCommand = new RelayCommand(() => PaneHolder?.CloseActivePane());
ToolbarViewModel.CreateNewFileCommand = new RelayCommand<ShellNewEntry>(x => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemDialogItemType.File, x, this));
ToolbarViewModel.CreateNewFolderCommand = new RelayCommand(() => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemDialogItemType.Folder, null, this));
Expand Down Expand Up @@ -891,7 +891,7 @@ private void SelectSidebarItemFromPath(Type incomingSourcePageType = null)
{
if (incomingSourcePageType == typeof(WidgetsPage) && incomingSourcePageType is not null)
{
ToolbarViewModel.PathControlDisplayText = "Home".GetLocalizedResource();
ToolbarViewModel.PathControlDisplayText = "Home";
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Views/MainPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ private void SidebarControl_SidebarItemInvoked(object sender, SidebarItemInvoked
{
navigationPath = invokedItemContainer.Tag?.ToString();
}
else if (ItemPath.Equals("Home".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase)) // Home item
else if (ItemPath.Equals("Home", StringComparison.OrdinalIgnoreCase)) // Home item
{
if (ItemPath.Equals(SidebarAdaptiveViewModel.SidebarSelectedItem?.Path, StringComparison.OrdinalIgnoreCase))
return; // return if already selected

navigationPath = "Home".GetLocalizedResource();
navigationPath = "Home";
sourcePageType = typeof(WidgetsPage);
}
else // Any other item
Expand All @@ -285,7 +285,7 @@ private void SidebarControl_SidebarItemInvoked(object sender, SidebarItemInvoked
shp.NavigateToPath(tagPath, new NavigationArguments()
{
IsSearchResultPage = true,
SearchPathParam = "Home".GetLocalizedResource(),
SearchPathParam = "Home",
SearchQuery = tagPath,
AssociatedTabInstance = shp,
NavPathParam = tagPath
Expand Down
14 changes: 7 additions & 7 deletions src/Files.App/Views/ModernShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public ModernShellPage()
if (flowDirectionSetting == "RTL")
FlowDirection = FlowDirection.RightToLeft;

ToolbarViewModel.PathControlDisplayText = "Home".GetLocalizedResource();
ToolbarViewModel.PathControlDisplayText = "Home";

ToolbarViewModel.ToolbarPathItemInvoked += ModernShellPage_NavigationRequested;
ToolbarViewModel.ToolbarFlyoutOpened += ModernShellPage_ToolbarFlyoutOpened;
Expand Down Expand Up @@ -253,7 +253,7 @@ private void InitToolbarCommands()
ToolbarViewModel.ClearContentPageSelectionCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.ClearSelection());
ToolbarViewModel.PasteItemsFromClipboardCommand = new RelayCommand(async () => await UIFilesystemHelpers.PasteItemAsync(FilesystemViewModel.WorkingDirectory, this));
ToolbarViewModel.OpenNewWindowCommand = new AsyncRelayCommand(NavigationHelpers.LaunchNewWindowAsync);
ToolbarViewModel.OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("Home".GetLocalizedResource()));
ToolbarViewModel.OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("Home"));
ToolbarViewModel.ClosePaneCommand = new RelayCommand(() => PaneHolder?.CloseActivePane());
ToolbarViewModel.CreateNewFileCommand = new RelayCommand<ShellNewEntry>(x => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemDialogItemType.File, x, this));
ToolbarViewModel.CreateNewFolderCommand = new RelayCommand(() => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemDialogItemType.Folder, null, this));
Expand Down Expand Up @@ -527,7 +527,7 @@ public NavigationParams NavParams

private void OnNavigationParamsChanged()
{
if (string.IsNullOrEmpty(NavParams?.NavPath) || NavParams.NavPath == "Home".GetLocalizedResource())
if (string.IsNullOrEmpty(NavParams?.NavPath) || NavParams.NavPath == "Home")
{
ItemDisplayFrame.Navigate(typeof(WidgetsPage),
new NavigationArguments()
Expand All @@ -546,7 +546,7 @@ private void OnNavigationParamsChanged()
NavPathParam = NavParams.NavPath,
SelectItems = !string.IsNullOrWhiteSpace(NavParams?.SelectItem) ? new[] { NavParams.SelectItem } : null,
IsSearchResultPage = isTagSearch,
SearchPathParam = isTagSearch ? "Home".GetLocalizedResource() : null,
SearchPathParam = isTagSearch ? "Home" : null,
SearchQuery = isTagSearch ? navParams.NavPath : null,
AssociatedTabInstance = this
});
Expand Down Expand Up @@ -905,7 +905,7 @@ public void Up_Click()
ItemDisplayFrame.Navigate(typeof(WidgetsPage),
new NavigationArguments()
{
NavPathParam = "Home".GetLocalizedResource(),
NavPathParam = "Home",
AssociatedTabInstance = this
}, new SuppressNavigationTransitionInfo());
}
Expand Down Expand Up @@ -934,7 +934,7 @@ public void Up_Click()
private void SelectSidebarItemFromPath(Type incomingSourcePageType = null)
{
if (incomingSourcePageType == typeof(WidgetsPage) && incomingSourcePageType is not null)
ToolbarViewModel.PathControlDisplayText = "Home".GetLocalizedResource();
ToolbarViewModel.PathControlDisplayText = "Home";
}

public void Dispose()
Expand Down Expand Up @@ -1050,7 +1050,7 @@ public void NavigateHome()
ItemDisplayFrame.Navigate(typeof(WidgetsPage),
new NavigationArguments()
{
NavPathParam = "Home".GetLocalizedResource(),
NavPathParam = "Home",
AssociatedTabInstance = this
}, new SuppressNavigationTransitionInfo());
}
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Views/PaneHolderPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
if (eventArgs.Parameter is string navPath)
{
NavParamsLeft = new NavigationParams { NavPath = navPath };
NavParamsRight = new NavigationParams { NavPath = "Home".GetLocalizedResource() };
NavParamsRight = new NavigationParams { NavPath = "Home" };
}
else if (eventArgs.Parameter is PaneNavigationArguments paneArgs)
{
Expand Down Expand Up @@ -309,7 +309,7 @@ private void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcc
{
if (string.IsNullOrEmpty(NavParamsRight?.NavPath))
{
NavParamsRight = new NavigationParams { NavPath = "Home".GetLocalizedResource() };
NavParamsRight = new NavigationParams { NavPath = "Home" };
}
IsRightPaneVisible = true;
ActivePane = PaneRight;
Expand All @@ -326,7 +326,7 @@ private void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcc
{
if (string.IsNullOrEmpty(NavParamsRight?.NavPath))
{
NavParamsRight = new NavigationParams { NavPath = "Home".GetLocalizedResource() };
NavParamsRight = new NavigationParams { NavPath = "Home" };
}
IsRightPaneVisible = true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/Views/WidgetsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,11 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
AppInstance.ToolbarViewModel.RefreshRequested += ToolbarViewModel_RefreshRequested;

// Set path of working directory empty
await AppInstance.FilesystemViewModel.SetWorkingDirectoryAsync("Home".GetLocalizedResource());
await AppInstance.FilesystemViewModel.SetWorkingDirectoryAsync("Home");

// Clear the path UI and replace with Favorites
AppInstance.ToolbarViewModel.PathComponents.Clear();
string componentLabel = parameters.NavPathParam;
string componentLabel = parameters.NavPathParam == "Home" ? "Home".GetLocalizedResource() : parameters.NavPathParam;
string tag = parameters.NavPathParam;
PathBoxItem item = new PathBoxItem()
{
Expand Down