Merge pull request #5257 from IvenBach/UpdateGeneralSettingsLabel

Update GeneralSettings header instructions

Author: retailcoder

Rubberduck.Core/UI/Settings/GeneralSettingsView.cs

@@ -0,0 +1,11 @@
+using Rubberduck.Resources;
+
+namespace Rubberduck.UI.Settings
+{
+    class GeneralSettingsView : SettingsView
+    {
+        public override string Instructions => string.Format(base.Instructions, 
+            RubberduckUI.SaveAndClose, 
+            RubberduckUI.CancelButtonText);
+    }
+}

Rubberduck.Core/UI/Settings/SettingsForm.cs

@@ -37,7 +37,7 @@ public SettingsForm(IConfigurationService<Configuration> configService,
 
             ViewModel = new SettingsControlViewModel(messageBox, configService,
                 config,
-                new SettingsView
+                new GeneralSettingsView
                 {
                     Control = new GeneralSettings(viewModelFactory.Create<Rubberduck.Settings.GeneralSettings>(config)),
                     View = SettingsViews.GeneralSettings

Rubberduck.Core/UI/Settings/SettingsView.cs

@@ -6,7 +6,7 @@ namespace Rubberduck.UI.Settings
     public class SettingsView
     {
         public string Label => SettingsUI.ResourceManager.GetString("PageHeader_" + View);
-        public string Instructions => SettingsUI.ResourceManager.GetString("PageInstructions_" + View, CultureInfo.CurrentUICulture);
+        public virtual string Instructions => SettingsUI.ResourceManager.GetString("PageInstructions_" + View, CultureInfo.CurrentUICulture);
         public ISettingsView Control { get; set; }
         public SettingsViews View { get; set; }
     }

Rubberduck.Resources/Settings/SettingsUI.Designer.cs

@@ -199,7 +199,7 @@
     <value>Configure which autocompletions are enabled.</value>
   </data>
   <data name="PageInstructions_GeneralSettings" xml:space="preserve">
-    <value>Click [Ok] to close the window and apply changes, or [Cancel] to discard them.</value>
+    <value>Click [{0}] to close the window and apply changes, or [{1}] to discard them.</value>
   </data>
   <data name="PageInstructions_IndenterSettings" xml:space="preserve">
     <value>Configure indenter settings.</value>