@@ -44,6 +44,8 @@ public InspectionSettingsViewModel(Configuration config, IConfigurationService<C
44
44
} ) ) ;
45
45
ImportButtonCommand = new DelegateCommand ( LogManager . GetCurrentClassLogger ( ) , _ => ImportSettings ( ) ) ;
46
46
47
+ _allResultsFilter = InspectionsUI . ResourceManager . GetString ( "CodeInspectionSeverity_All" , CultureInfo . CurrentUICulture ) ;
48
+ SelectedSeverityFilter = _allResultsFilter ;
47
49
SeverityFilters = new ObservableCollection < string > (
48
50
new [ ] { InspectionsUI . ResourceManager . GetString ( "CodeInspectionSeverity_All" , CultureInfo . CurrentUICulture ) }
49
51
. Concat ( Enum . GetNames ( typeof ( CodeInspectionSeverity ) ) . Select ( s => InspectionsUI . ResourceManager . GetString ( "CodeInspectionSeverity_" + s , CultureInfo . CurrentUICulture ) ) ) ) ;
@@ -79,14 +81,14 @@ public string InspectionSettingsDescriptionFilter
79
81
80
82
public ObservableCollection < string > SeverityFilters { get ; }
81
83
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 ;
84
86
public string SelectedSeverityFilter
85
87
{
86
88
get => _selectedSeverityFilter ;
87
89
set
88
90
{
89
- if ( ! _selectedSeverityFilter . Equals ( value ) )
91
+ if ( _selectedSeverityFilter == null || ! _selectedSeverityFilter . Equals ( value ) )
90
92
{
91
93
_selectedSeverityFilter = value . Replace ( " " , string . Empty ) ;
92
94
OnPropertyChanged ( ) ;
@@ -99,9 +101,11 @@ public string SelectedSeverityFilter
99
101
private bool FilterResults ( object setting )
100
102
{
101
103
var cis = setting as CodeInspectionSetting ;
104
+ var localizedSeverity = InspectionsUI . ResourceManager . GetString ( "CodeInspectionSeverity_" + cis . Severity , CultureInfo . CurrentUICulture )
105
+ . Replace ( " " , string . Empty ) ;
102
106
103
107
return cis . Description . ToUpper ( ) . Contains ( _inspectionSettingsDescriptionFilter . ToUpper ( ) )
104
- && ( _selectedSeverityFilter . Equals ( _allResultsFilter ) || cis . Severity . ToString ( ) . Equals ( _selectedSeverityFilter ) ) ;
108
+ && ( _selectedSeverityFilter . Equals ( _allResultsFilter ) || localizedSeverity . Equals ( _selectedSeverityFilter ) ) ;
105
109
}
106
110
107
111
private ListCollectionView _inspectionSettings ;
0 commit comments