Merge pull request #1944 from Hosch250/Issue1397

retailcoder · web-flow · commit ed3e6ee3cd45 · 2016-06-30T15:06:30.000-04:00
Fix some localization
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -37,6 +37,7 @@ public sealed class App : IDisposable
         private bool _handleSinkEvents = true;
         private readonly BranchesViewViewModel _branchesVM;
         private readonly SourceControlViewViewModel _sourceControlPanelVM;
+        private readonly UI.Settings.Settings _settings;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -52,6 +53,7 @@ public sealed class App : IDisposable
             new Dictionary<string, Tuple<IConnectionPoint, int>>();
 
         public App(VBE vbe, IMessageBox messageBox,
+            UI.Settings.Settings settings,
             IRubberduckParser parser,
             IGeneralConfigService configService,
             IAppMenu appMenus,
@@ -61,6 +63,7 @@ public App(VBE vbe, IMessageBox messageBox,
         {
             _vbe = vbe;
             _messageBox = messageBox;
+            _settings = settings;
             _parser = parser;
             _configService = configService;
             _autoSave = new AutoSave.AutoSave(_vbe, _configService);
@@ -543,6 +546,11 @@ public void Dispose()
                 _hooks = null;
             }
 
+            if (_settings != null)
+            {
+                _settings.Dispose();
+            }
+
             if (_configService != null)
             {
                 _configService.SettingsChanged -= _configService_SettingsChanged;
diff --git a/RetailCoder.VBE/Common/DeclarationExtensions.cs b/RetailCoder.VBE/Common/DeclarationExtensions.cs
@@ -22,7 +22,7 @@ public static class DeclarationExtensions
 
         public static string ToLocalizedString(this DeclarationType type)
         {
-            return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type);
+            return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, UI.Settings.Settings.Culture);
         }
 
         public static BitmapImage BitmapImage(this Declaration declaration)
diff --git a/RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs b/RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs
@@ -41,7 +41,7 @@ public class RenameProjectQuickFix : CodeInspectionQuickFix
         private readonly RubberduckParserState _state;
 
         public RenameProjectQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state)
-            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, RubberduckUI.Culture)))
+            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, UI.Settings.Settings.Culture)))
         {
             _target = target;
             _state = state;
diff --git a/RetailCoder.VBE/Inspections/InspectionBase.cs b/RetailCoder.VBE/Inspections/InspectionBase.cs
@@ -54,13 +54,13 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
         /// <summary>
         /// Meta-information about why an inspection exists.
         /// </summary>
-        public virtual string Meta { get { return InspectionsUI.ResourceManager.GetString(Name + "Meta"); } }
+        public virtual string Meta { get { return InspectionsUI.ResourceManager.GetString(Name + "Meta", UI.Settings.Settings.Culture); } }
         
         /// <summary>
         /// Gets a localized string representing the type of inspection.
         /// <see cref="InspectionType"/>
         /// </summary>
-        public virtual string InspectionTypeName { get { return InspectionsUI.ResourceManager.GetString(InspectionType.ToString()); } }
+        public virtual string InspectionTypeName { get { return InspectionsUI.ResourceManager.GetString(InspectionType.ToString(), UI.Settings.Settings.Culture); } }
 
         /// <summary>
         /// Gets a string representing the text that must be present in an 
diff --git a/RetailCoder.VBE/Inspections/Inspector.cs b/RetailCoder.VBE/Inspections/Inspector.cs
@@ -81,7 +81,7 @@ public async Task<IEnumerable<ICodeInspectionResult>> FindIssuesAsync(Rubberduck
                         })).ToList();
 
                 await Task.WhenAll(inspections);
-                state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status)); // should be "Ready"
+                state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status, UI.Settings.Settings.Culture)); // should be "Ready"
                 return allIssues;
             }
 
diff --git a/RetailCoder.VBE/Inspections/UseMeaningfulNameInspectionResult.cs b/RetailCoder.VBE/Inspections/UseMeaningfulNameInspectionResult.cs
@@ -28,7 +28,7 @@ public UseMeaningfulNameInspectionResult(IInspection inspection, Declaration tar
 
         public override string Description
         {
-            get { return string.Format(InspectionsUI.UseMeaningfulNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType), Target.IdentifierName); }
+            get { return string.Format(InspectionsUI.UseMeaningfulNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, UI.Settings.Settings.Culture), Target.IdentifierName); }
         }
 
         public override NavigateCodeEventArgs GetNavigationArgs()
@@ -47,7 +47,7 @@ public class RenameDeclarationQuickFix : CodeInspectionQuickFix
         private readonly IMessageBox _messageBox;
 
         public RenameDeclarationQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, IMessageBox messageBox)
-            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, RubberduckUI.Culture)))
+            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, UI.Settings.Settings.Culture)))
         {
             _target = target;
             _state = state;
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -729,6 +729,7 @@
     <Compile Include="UI\Settings\InspectionSettingsViewModel.cs" />
     <Compile Include="UI\Settings\ISettingsView.cs" />
     <Compile Include="UI\Settings\ISettingsViewModel.cs" />
+    <Compile Include="UI\Settings\Settings.cs" />
     <Compile Include="UI\Settings\SettingsControl.xaml.cs">
       <DependentUpon>SettingsControl.xaml</DependentUpon>
     </Compile>
diff --git a/RetailCoder.VBE/Settings/CodeInspectionSettings.cs b/RetailCoder.VBE/Settings/CodeInspectionSettings.cs
@@ -53,7 +53,7 @@ public string LocalizedName
         {
             get
             {
-                return InspectionsUI.ResourceManager.GetString(Name + "Name");
+                return InspectionsUI.ResourceManager.GetString(Name + "Name", UI.Settings.Settings.Culture);
             }
         } // not serialized because culture-dependent
 
@@ -71,25 +71,25 @@ public string Meta
         {
             get
             {
-                return InspectionsUI.ResourceManager.GetString(Name + "Meta");
+                return InspectionsUI.ResourceManager.GetString(Name + "Meta", UI.Settings.Settings.Culture);
             }
         }
 
         [XmlIgnore]
         public string TypeLabel
         {
-            get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType); }
+            get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType, UI.Settings.Settings.Culture); }
         }
 
         [XmlIgnore]
         public string SeverityLabel
         {
-            get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, RubberduckUI.Culture); }
+            get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, UI.Settings.Settings.Culture); }
             set
             {
                 foreach (var severity in Enum.GetValues(typeof (CodeInspectionSeverity)))
                 {
-                    if (value == RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + severity, RubberduckUI.Culture))
+                    if (value == RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + severity, UI.Settings.Settings.Culture))
                     {
                         Severity = (CodeInspectionSeverity)severity;
                         return;
diff --git a/RetailCoder.VBE/Settings/HotkeySetting.cs b/RetailCoder.VBE/Settings/HotkeySetting.cs
@@ -23,7 +23,7 @@ public class HotkeySetting
         [XmlIgnore]
         public string Prompt
         {
-            get { return RubberduckUI.ResourceManager.GetString("HotkeyDescription_" + Name); } 
+            get { return RubberduckUI.ResourceManager.GetString("HotkeyDescription_" + Name, UI.Settings.Settings.Culture); } 
         }
 
         public string ToMenuHotkeyString()
diff --git a/RetailCoder.VBE/Settings/MinimumLogLevel.cs b/RetailCoder.VBE/Settings/MinimumLogLevel.cs
@@ -10,7 +10,7 @@ public sealed class MinimumLogLevel
         public MinimumLogLevel(int ordinal, string logLevelName)
         {
             _ordinal = ordinal;
-            _name = RubberduckUI.ResourceManager.GetString("GeneralSettings_" + logLevelName + "LogLevel");
+            _name = RubberduckUI.ResourceManager.GetString("GeneralSettings_" + logLevelName + "LogLevel", UI.Settings.Settings.Culture);
         }
 
         public int Ordinal
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/CommandMenuItemBase.cs b/RetailCoder.VBE/UI/Command/MenuItems/CommandMenuItemBase.cs
@@ -24,7 +24,7 @@ public Func<string> Caption
             {
                 return () => Key.IsNullOrEmpty() 
                     ? string.Empty 
-                    : RubberduckUI.ResourceManager.GetString(Key, RubberduckUI.Culture);
+                    : RubberduckUI.ResourceManager.GetString(Key, UI.Settings.Settings.Culture);
             }
         }
 
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs
@@ -31,7 +31,7 @@ protected ParentMenuItemBase(string key, IEnumerable<IMenuItem> items, int? befo
 
         public string Key { get { return Item == null ? null : Item.Tag; } }
 
-        public Func<string> Caption { get { return () => Key == null ? null : RubberduckUI.ResourceManager.GetString(Key, RubberduckUI.Culture); } }
+        public Func<string> Caption { get { return () => Key == null ? null : RubberduckUI.ResourceManager.GetString(Key, UI.Settings.Settings.Culture); } }
 
         public virtual bool BeginGroup { get { return false; } }
         public virtual int DisplayOrder { get { return default(int); } }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs b/RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs
@@ -6,7 +6,6 @@
 using Rubberduck.Properties;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 using Rubberduck.VBEditor;
-using ParserState = Rubberduck.Parsing.VBA.ParserState;
 
 namespace Rubberduck.UI.Command.MenuItems
 {
@@ -30,7 +29,7 @@ public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErr
             Initialize();
         }
 
-        private void _statusButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
+        private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         {
             if (_state.Status == ParserState.Error)
             {
@@ -40,7 +39,7 @@ private void _statusButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
 
         public void SetStatusText(string value = null)
         {
-            var text = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status);
+            var text = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status, UI.Settings.Settings.Culture);
             UiDispatcher.Invoke(() => _statusButton.Caption = text);
         }
 
@@ -52,21 +51,31 @@ public void SetSelectionText(Declaration declaration)
                 if (selection.HasValue) { SetSelectionText(selection.Value); }
                 _selectionButton.TooltipText = _selectionButton.Caption;
             }
-            else if (declaration != null)
+            else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.ClassModule && declaration.DeclarationType != DeclarationType.ProceduralModule)
             {
-                var typeName = declaration.HasTypeHint
-                    ? Declaration.TypeHintToTypeName[declaration.TypeHint]
-                    : declaration.AsTypeName;
-
                 _selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
                     declaration.QualifiedSelection.Selection,
                     declaration.QualifiedName.QualifiedModuleName,
                     declaration.IdentifierName,
-                    RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType),
-                    string.IsNullOrEmpty(declaration.AsTypeName)
-                        ? string.Empty
-                        : ": " + typeName);
-
+                    RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
+                    string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + declaration.AsTypeName);
+                _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
+                    ? _selectionButton.Caption
+                    : declaration.DescriptionString;
+            }
+            else if (declaration != null)
+            {
+                // todo: confirm this is what we want, and then refator
+                var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
+                if (selection.HasValue)
+                {
+                    _selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
+                        selection.Value.Selection,
+                        declaration.QualifiedName.QualifiedModuleName,
+                        declaration.IdentifierName,
+                        RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
+                    string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + declaration.AsTypeName);
+                }
                 _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
                     ? _selectionButton.Caption
                     : declaration.DescriptionString;
@@ -82,7 +91,7 @@ private void State_StateChanged(object sender, EventArgs e)
         {
             if (_state.Status != ParserState.ResolvedDeclarations)
             {
-                SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
+                SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status, UI.Settings.Settings.Culture));
             }
         }
 
@@ -97,7 +106,7 @@ private void OnRefresh()
             }
         }
 
-        private void Initialize()
+        public void Initialize()
         {
             _commandbar = _vbe.CommandBars.Add("Rubberduck", MsoBarPosition.msoBarTop, false, true);
 
@@ -121,7 +130,7 @@ private void Initialize()
             _commandbar.Visible = true;
         }
 
-        private void refreshButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
+        private void refreshButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         {
             OnRefresh();
         }
diff --git a/RetailCoder.VBE/UI/Controls/DeclarationTypeToStringConverter.cs b/RetailCoder.VBE/UI/Controls/DeclarationTypeToStringConverter.cs
@@ -12,7 +12,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (value is DeclarationType)
             {
                 var type = (DeclarationType)value;
-                var text = RubberduckUI.ResourceManager.GetString("DeclarationType_" + type) ?? string.Empty;
+                var text = RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, UI.Settings.Settings.Culture) ?? string.Empty;
                 return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text);
             }
 
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionDescriptionConverter.cs b/RetailCoder.VBE/UI/Inspections/InspectionDescriptionConverter.cs
@@ -15,7 +15,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 return null;
             }
 
-            return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + inspection.InspectionType);
+            return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + inspection.InspectionType, UI.Settings.Settings.Culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -34,7 +34,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 return null;
             }
 
-            return InspectionsUI.ResourceManager.GetString(inspection.Name + "Name");
+            return InspectionsUI.ResourceManager.GetString(inspection.Name + "Name", UI.Settings.Settings.Culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/RetailCoder.VBE/UI/Refactorings/RenameDialog.cs b/RetailCoder.VBE/UI/Refactorings/RenameDialog.cs
@@ -53,7 +53,7 @@ public Declaration Target
 
                 NewName = _target.IdentifierName;
                 var declarationType =
-                    RubberduckUI.ResourceManager.GetString("DeclarationType_" + _target.DeclarationType, RubberduckUI.Culture);
+                    RubberduckUI.ResourceManager.GetString("DeclarationType_" + _target.DeclarationType, UI.Settings.Settings.Culture);
                 InstructionsLabel.Text = string.Format(RubberduckUI.RenameDialog_InstructionsLabelText, declarationType,
                     _target.IdentifierName);
             }
diff --git a/RetailCoder.VBE/UI/Settings/Converters/AssertModeToTextConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/AssertModeToTextConverter.cs
@@ -11,7 +11,7 @@ public class AssertModeToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var modes = (IEnumerable<Rubberduck.Settings.AssertMode>)value;
-            return modes.Select(s => RubberduckUI.ResourceManager.GetString("UnitTestSettings_" + s)).ToArray();
+            return modes.Select(s => RubberduckUI.ResourceManager.GetString("UnitTestSettings_" + s, UI.Settings.Settings.Culture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/RetailCoder.VBE/UI/Settings/Converters/BindingModeToTextConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/BindingModeToTextConverter.cs
@@ -11,7 +11,7 @@ public class BindingModeToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var modes = (IEnumerable<Rubberduck.Settings.BindingMode>)value;
-            return modes.Select(s => RubberduckUI.ResourceManager.GetString("UnitTestSettings_" + s)).ToArray();
+            return modes.Select(s => RubberduckUI.ResourceManager.GetString("UnitTestSettings_" + s, UI.Settings.Settings.Culture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/RetailCoder.VBE/UI/Settings/Converters/CodeInspectionSeverityEnumToTextConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/CodeInspectionSeverityEnumToTextConverter.cs
@@ -12,7 +12,7 @@ public class CodeInspectionSeverityEnumToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var severities = (IEnumerable<CodeInspectionSeverity>)value;
-            return severities.Select(s => RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + s)).ToArray();
+            return severities.Select(s => RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + s, UI.Settings.Settings.Culture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/RetailCoder.VBE/UI/Settings/Converters/DelimiterToTextConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/DelimiterToTextConverter.cs
@@ -11,7 +11,7 @@ public class DelimiterToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var modes = (IEnumerable<DelimiterOptions>)value;
-            return modes.Select(s => RubberduckUI.ResourceManager.GetString("GeneralSettings_" + s + "Delimiter")).ToArray();
+            return modes.Select(s => RubberduckUI.ResourceManager.GetString("GeneralSettings_" + s + "Delimiter", UI.Settings.Settings.Culture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/RetailCoder.VBE/UI/Settings/Converters/EndOfLineCommentStyleToTextConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/EndOfLineCommentStyleToTextConverter.cs
@@ -12,7 +12,7 @@ public class EndOfLineCommentStyleToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var styles = (IEnumerable<EndOfLineCommentStyle>)value;
-            return styles.Select(s => RubberduckUI.ResourceManager.GetString("EndOfLineCommentStyle_" + s)).ToArray();
+            return styles.Select(s => RubberduckUI.ResourceManager.GetString("EndOfLineCommentStyle_" + s, UI.Settings.Settings.Culture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/RetailCoder.VBE/UI/Settings/Converters/EndOfLineCommentStyleValueTextToEnumValueConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/EndOfLineCommentStyleValueTextToEnumValueConverter.cs
diff --git a/RetailCoder.VBE/UI/Settings/InspectionSettings.xaml.cs b/RetailCoder.VBE/UI/Settings/InspectionSettings.xaml.cs
diff --git a/RetailCoder.VBE/UI/Settings/Settings.cs b/RetailCoder.VBE/UI/Settings/Settings.cs
diff --git a/RetailCoder.VBE/UI/Settings/SettingsControlViewModel.cs b/RetailCoder.VBE/UI/Settings/SettingsControlViewModel.cs
diff --git a/RetailCoder.VBE/UI/Settings/SettingsView.cs b/RetailCoder.VBE/UI/Settings/SettingsView.cs
diff --git a/RetailCoder.VBE/UI/SourceControl/Converters/CommitActionsToTextConverter.cs b/RetailCoder.VBE/UI/SourceControl/Converters/CommitActionsToTextConverter.cs
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestResultToOutcomeTextConverter.cs b/RetailCoder.VBE/UI/UnitTesting/TestResultToOutcomeTextConverter.cs

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static class DeclarationExtensions`
`22`	`22`
`23`	`23`	`public static string ToLocalizedString(this DeclarationType type)`
`24`	`24`	`{`
`25`		`- return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type);`
	`25`	`+ return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, UI.Settings.Settings.Culture);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public static BitmapImage BitmapImage(this Declaration declaration)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class RenameProjectQuickFix : CodeInspectionQuickFix`
`41`	`41`	`private readonly RubberduckParserState _state;`
`42`	`42`
`43`	`43`	`public RenameProjectQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state)`
`44`		`- : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, RubberduckUI.Culture)))`
	`44`	`+ : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, UI.Settings.Settings.Culture)))`
`45`	`45`	`{`
`46`	`46`	`_target = target;`
`47`	`47`	`_state = state;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public async Task<IEnumerable<ICodeInspectionResult>> FindIssuesAsync(Rubberduck`
`81`	`81`	`})).ToList();`
`82`	`82`
`83`	`83`	`await Task.WhenAll(inspections);`
`84`		`- state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status)); // should be "Ready"`
	`84`	`+ state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status, UI.Settings.Settings.Culture)); // should be "Ready"`
`85`	`85`	`return allIssues;`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public UseMeaningfulNameInspectionResult(IInspection inspection, Declaration tar`
`28`	`28`
`29`	`29`	`public override string Description`
`30`	`30`	`{`
`31`		`- get { return string.Format(InspectionsUI.UseMeaningfulNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType), Target.IdentifierName); }`
	`31`	`+ get { return string.Format(InspectionsUI.UseMeaningfulNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, UI.Settings.Settings.Culture), Target.IdentifierName); }`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public override NavigateCodeEventArgs GetNavigationArgs()`
`@@ -47,7 +47,7 @@ public class RenameDeclarationQuickFix : CodeInspectionQuickFix`
`47`	`47`	`private readonly IMessageBox _messageBox;`
`48`	`48`
`49`	`49`	`public RenameDeclarationQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, IMessageBox messageBox)`
`50`		`- : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, RubberduckUI.Culture)))`
	`50`	`+ : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, UI.Settings.Settings.Culture)))`
`51`	`51`	`{`
`52`	`52`	`_target = target;`
`53`	`53`	`_state = state;`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public string LocalizedName`
`53`	`53`	`{`
`54`	`54`	`get`
`55`	`55`	`{`
`56`		`- return InspectionsUI.ResourceManager.GetString(Name + "Name");`
	`56`	`+ return InspectionsUI.ResourceManager.GetString(Name + "Name", UI.Settings.Settings.Culture);`
`57`	`57`	`}`
`58`	`58`	`} // not serialized because culture-dependent`
`59`	`59`
`@@ -71,25 +71,25 @@ public string Meta`
`71`	`71`	`{`
`72`	`72`	`get`
`73`	`73`	`{`
`74`		`- return InspectionsUI.ResourceManager.GetString(Name + "Meta");`
	`74`	`+ return InspectionsUI.ResourceManager.GetString(Name + "Meta", UI.Settings.Settings.Culture);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`[XmlIgnore]`
`79`	`79`	`public string TypeLabel`
`80`	`80`	`{`
`81`		`- get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType); }`
	`81`	`+ get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType, UI.Settings.Settings.Culture); }`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`[XmlIgnore]`
`85`	`85`	`public string SeverityLabel`
`86`	`86`	`{`
`87`		`- get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, RubberduckUI.Culture); }`
	`87`	`+ get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, UI.Settings.Settings.Culture); }`
`88`	`88`	`set`
`89`	`89`	`{`
`90`	`90`	`foreach (var severity in Enum.GetValues(typeof (CodeInspectionSeverity)))`
`91`	`91`	`{`
`92`		`- if (value == RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + severity, RubberduckUI.Culture))`
	`92`	`+ if (value == RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + severity, UI.Settings.Settings.Culture))`
`93`	`93`	`{`
`94`	`94`	`Severity = (CodeInspectionSeverity)severity;`
`95`	`95`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class HotkeySetting`
`23`	`23`	`[XmlIgnore]`
`24`	`24`	`public string Prompt`
`25`	`25`	`{`
`26`		`- get { return RubberduckUI.ResourceManager.GetString("HotkeyDescription_" + Name); }`
	`26`	`+ get { return RubberduckUI.ResourceManager.GetString("HotkeyDescription_" + Name, UI.Settings.Settings.Culture); }`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public string ToMenuHotkeyString()`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public sealed class MinimumLogLevel`
`10`	`10`	`public MinimumLogLevel(int ordinal, string logLevelName)`
`11`	`11`	`{`
`12`	`12`	`_ordinal = ordinal;`
`13`		`- _name = RubberduckUI.ResourceManager.GetString("GeneralSettings_" + logLevelName + "LogLevel");`
	`13`	`+ _name = RubberduckUI.ResourceManager.GetString("GeneralSettings_" + logLevelName + "LogLevel", UI.Settings.Settings.Culture);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public int Ordinal`