From 2bb71e6af1bc3eba727a614999ba6af28a80f631 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 1 Jun 2019 22:02:16 -0400
Subject: [PATCH] preferences and menu bar labels for mac

---
 src/app/accounts/settings.component.html | 4 ++--
 src/app/accounts/settings.component.ts   | 6 ++++++
 src/locales/en/messages.json             | 9 +++++++++
 src/main/menu.main.ts                    | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 46024ae0..0783946e 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -53,10 +53,10 @@
                                 <label for="enableTray">
                                     <input id="enableTray" type="checkbox" name="EnableTray" [(ngModel)]="enableTray"
                                         (change)="saveTray()">
-                                    {{'enableTray' | i18n}}
+                                    {{enableTrayText}}
                                 </label>
                             </div>
-                            <small class="help-block">{{'enableTrayDesc' | i18n}}</small>
+                            <small class="help-block">{{enableTrayDescText}}</small>
                         </div>
                         <div class="form-group" *ngIf="showMinToTray">
                             <div class="checkbox">
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index bc97fc79..68eff377 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -44,12 +44,18 @@ export class SettingsComponent implements OnInit {
     themeOptions: any[];
     clearClipboard: number;
     clearClipboardOptions: any[];
+    enableTrayText: string;
+    enableTrayDescText: string;
 
     constructor(private analytics: Angulartics2, private toasterService: ToasterService,
         private i18nService: I18nService, private platformUtilsService: PlatformUtilsService,
         private storageService: StorageService, private lockService: LockService,
         private stateService: StateService, private messagingService: MessagingService,
         private userService: UserService, private cryptoService: CryptoService) {
+        const trayKey = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop ?
+            'enableMenuBar' : 'enableTray';
+        this.enableTrayText = this.i18nService.t(trayKey);
+        this.enableTrayDescText = this.i18nService.t(trayKey + 'Desc');
         this.lockOptions = [
             // { name: i18nService.t('immediately'), value: 0 },
             { name: i18nService.t('oneMinute'), value: 1 },
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 633446c1..31504744 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1218,5 +1218,14 @@
   },
   "lockWithMasterPassOnRestart": {
     "message": "Lock with master password on restart"
+  },
+  "preferences": {
+    "message": "Preferences"
+  },
+  "enableMenuBar": {
+    "message": "Enable Menu Bar Icon"
+  },
+  "enableMenuBarDesc": {
+    "message": "Always show an icon in the menu bar."
   }
 }
diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts
index 1035aa68..b54bc6b7 100644
--- a/src/main/menu.main.ts
+++ b/src/main/menu.main.ts
@@ -358,7 +358,7 @@ export class MenuMain extends BaseMenu {
         const firstMenuOptions: MenuItemConstructorOptions[] = [
             { type: 'separator' },
             {
-                label: this.main.i18nService.t('settings'),
+                label: this.main.i18nService.t(process.platform === 'darwin' ? 'preferences' : 'settings'),
                 id: 'settings',
                 click: () => this.main.messagingService.send('openSettings'),
                 accelerator: 'CmdOrCtrl+,',