Skip to content

Fix: Fixed issue where settings displayed wrong language after installing Files #10222

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 2 commits into from
Oct 16, 2022
Merged

Fix: Fixed issue where settings displayed wrong language after installing Files #10222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4019c6c
Use default Language
cinqmilleans Oct 15, 2022
f55855e
Fixed whitespaces
yaira2 Oct 16, 2022
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
17 changes: 10 additions & 7 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 @@ -130,7 +130,7 @@ public Terminal SelectedTerminal
public PreferencesViewModel()
{
EditTerminalApplicationsCommand = new AsyncRelayCommand(LaunchTerminalsConfigFile);
OpenFilesAtStartupCommand = new AsyncRelayCommand(OpenFilesAtStartup);
OpenFilesAtStartupCommand = new AsyncRelayCommand(OpenFilesAtStartup);
ChangePageCommand = new AsyncRelayCommand(ChangePage);
RemovePageCommand = new RelayCommand(RemovePage);
AddPageCommand = new RelayCommand<string>(async (path) => await AddPage(path));
Expand Down Expand Up @@ -168,13 +168,16 @@ private void AddDateTimeOptions()

private void AddSupportedAppLanguages()
{
var supportedLanguages = ApplicationLanguages.ManifestLanguages;
var appLanguages = ApplicationLanguages.ManifestLanguages
.Append(string.Empty) // add default language id
.Select(language => new AppLanguageItem(language))
.OrderBy(language => language.LanguagID is not "") // default language on top
.ThenBy(language => language.LanguageName);
AppLanguages = new ObservableCollection<AppLanguageItem>(appLanguages);

AppLanguages = new ObservableCollection<AppLanguageItem> { };
foreach (var language in supportedLanguages)
AppLanguages.Add(new AppLanguageItem(language));

SelectedAppLanguageIndex = AppLanguages.IndexOf(AppLanguages.FirstOrDefault(dl => dl.LanguagID == ApplicationLanguages.PrimaryLanguageOverride) ?? AppLanguages.FirstOrDefault());
string languageID = ApplicationLanguages.PrimaryLanguageOverride;
SelectedAppLanguageIndex = AppLanguages
.IndexOf(AppLanguages.FirstOrDefault(dl => dl.LanguagID == languageID) ?? AppLanguages.First());
}

private async Task InitStartupSettingsRecentFoldersFlyout()
Expand Down