Skip to content

Commit 169daaa

Browse files
committed
Use localized severity for settings filter
1 parent 1bcc6df commit 169daaa

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Rubberduck.Core/UI/Settings/InspectionSettingsViewModel.cs

+8-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public InspectionSettingsViewModel(Configuration config, IConfigurationService<C
4444
}));
4545
ImportButtonCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ImportSettings());
4646

47+
_allResultsFilter = InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_All", CultureInfo.CurrentUICulture);
48+
SelectedSeverityFilter = _allResultsFilter;
4749
SeverityFilters = new ObservableCollection<string>(
4850
new[] { InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_All", CultureInfo.CurrentUICulture) }
4951
.Concat(Enum.GetNames(typeof(CodeInspectionSeverity)).Select(s => InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_" + s, CultureInfo.CurrentUICulture))));
@@ -79,14 +81,14 @@ public string InspectionSettingsDescriptionFilter
7981

8082
public ObservableCollection<string> SeverityFilters { get; }
8183

82-
private static readonly string _allResultsFilter = InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_All", CultureInfo.CurrentUICulture);
83-
private string _selectedSeverityFilter = _allResultsFilter;
84+
private readonly string _allResultsFilter;
85+
private string _selectedSeverityFilter;
8486
public string SelectedSeverityFilter
8587
{
8688
get => _selectedSeverityFilter;
8789
set
8890
{
89-
if (!_selectedSeverityFilter.Equals(value))
91+
if (_selectedSeverityFilter == null || !_selectedSeverityFilter.Equals(value))
9092
{
9193
_selectedSeverityFilter = value.Replace(" ", string.Empty);
9294
OnPropertyChanged();
@@ -99,9 +101,11 @@ public string SelectedSeverityFilter
99101
private bool FilterResults(object setting)
100102
{
101103
var cis = setting as CodeInspectionSetting;
104+
var localizedSeverity = InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_" + cis.Severity, CultureInfo.CurrentUICulture)
105+
.Replace(" ", string.Empty);
102106

103107
return cis.Description.ToUpper().Contains(_inspectionSettingsDescriptionFilter.ToUpper())
104-
&& (_selectedSeverityFilter.Equals(_allResultsFilter) || cis.Severity.ToString().Equals(_selectedSeverityFilter));
108+
&& (_selectedSeverityFilter.Equals(_allResultsFilter) || localizedSeverity.Equals(_selectedSeverityFilter));
105109
}
106110

107111
private ListCollectionView _inspectionSettings;

0 commit comments

Comments
 (0)