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 @@ {{'startToTrayDesc' | i18n}} -
+
-
- {{'hideDockDesc' | i18n}} + {{'alwaysShowDockDesc' | i18n}}
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(ConstantsService.biometricText); - this.hideDock = await this.storageService.get(ElectronConstants.hideDock); - this.showHideDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop; + this.alwaysShowDock = await this.storageService.get(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"