From ae5a5082db2d60535425780973ac17aa9af346ff Mon Sep 17 00:00:00 2001
From: Hinton <hinton.oscar@gmail.com>
Date: Fri, 20 Nov 2020 15:49:50 +0100
Subject: [PATCH] Change "hide dock" to "always show dock"

---
 src/app/accounts/settings.component.html | 12 ++++++------
 src/app/accounts/settings.component.ts   | 12 ++++++------
 src/locales/en/messages.json             |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 9fef93a2ee..496cc085f5 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -128,15 +128,15 @@
                             </div>
                             <small class="help-block">{{'startToTrayDesc' | i18n}}</small>
                         </div>
-                        <div class="form-group" *ngIf="showHideDock">
+                        <div class="form-group" *ngIf="showAlwaysShowDock">
                             <div class="checkbox">
-                                <label for="hideDock">
-                                    <input id="hideDock" type="checkbox" name="HideDock" [(ngModel)]="hideDock"
-                                        (change)="saveHideDock()">
-                                    {{'hideDock' | i18n}}
+                                <label for="alwaysShowDock">
+                                    <input id="alwaysShowDock" type="checkbox" name="AlwaysShowDock" [(ngModel)]="alwaysShowDock"
+                                        (change)="saveAlwaysShowDock()">
+                                    {{'alwaysShowDock' | i18n}}
                                 </label>
                             </div>
-                            <small class="help-block">{{'hideDockDesc' | i18n}}</small>
+                            <small class="help-block">{{'alwaysShowDockDesc' | i18n}}</small>
                         </div>
                         <div class="form-group">
                             <label for="theme">{{'theme' | i18n}}</label>
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 3e5dcf3acc..7ceda1fd11 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -51,8 +51,8 @@ export class SettingsComponent implements OnInit {
     supportsBiometric: boolean;
     biometric: boolean;
     biometricText: string;
-    hideDock: boolean;
-    showHideDock: boolean = false;
+    alwaysShowDock: boolean;
+    showAlwaysShowDock: boolean = false;
 
     constructor(private analytics: Angulartics2, private toasterService: ToasterService,
         private i18nService: I18nService, private platformUtilsService: PlatformUtilsService,
@@ -133,8 +133,8 @@ export class SettingsComponent implements OnInit {
         this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
         this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
         this.biometricText = await this.storageService.get<string>(ConstantsService.biometricText);
-        this.hideDock = await this.storageService.get<boolean>(ElectronConstants.hideDock);
-        this.showHideDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
+        this.alwaysShowDock = await this.storageService.get<boolean>(ElectronConstants.alwaysShowDock);
+        this.showAlwaysShowDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
     }
 
     async saveVaultTimeoutOptions() {
@@ -281,8 +281,8 @@ export class SettingsComponent implements OnInit {
         });
     }
 
-    async saveHideDock() {
-        await this.storageService.save(ElectronConstants.hideDock, this.hideDock);
+    async saveAlwaysShowDock() {
+        await this.storageService.save(ElectronConstants.alwaysShowDock, this.alwaysShowDock);
     }
 
     private callAnalytics(name: string, enabled: boolean) {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 9d75ebcde4..27cd720c76 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -870,11 +870,11 @@
   "startToTrayDesc": {
     "message": "When the application is first started, only show an icon in the system tray."
   },
-  "hideDock": {
-    "message": "Hide dock icon"
+  "alwaysShowDock": {
+    "message": "Always show in the Dock"
   },
-  "hideDockDesc": {
-    "message": "Hide Bitwarden from the Dock when minimized to the menu bar."
+  "alwaysShowDockDesc": {
+    "message": "Show the Bitwarden icon in the Dock even when minimized to the menu bar."
   },
   "language": {
     "message": "Language"