From 07846bb85313eaac5c0e0c37c8a8799664f8b616 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 15 Jan 2018 22:08:53 -0500
Subject: [PATCH] no on locked for safari

---
 src/popup/app/global/home.html               | 2 +-
 src/popup/app/settings/settings.component.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/popup/app/global/home.html b/src/popup/app/global/home.html
index 5b451834bc1..19485046c2f 100644
--- a/src/popup/app/global/home.html
+++ b/src/popup/app/global/home.html
@@ -1,6 +1,6 @@
 <div class="home-page">
     <a ui-sref="environment({animation: 'in-slide-up'})" class="settings-icon">
-        <i class="fa fa-cog fa-lg"></i><span>&nbsp;Settings</span>
+        <i class="fa fa-cog fa-lg"></i><span>&nbsp;{{i18n.settings}}</span>
     </a>
     <img src="../../images/logo@2x.png" alt="bitwarden" />
     <p>{{i18n.loginOrCreateNewAccount}}</p>
diff --git a/src/popup/app/settings/settings.component.ts b/src/popup/app/settings/settings.component.ts
index 8ef7bd22c7d..6fdf465f066 100644
--- a/src/popup/app/settings/settings.component.ts
+++ b/src/popup/app/settings/settings.component.ts
@@ -49,7 +49,8 @@ export class SettingsController {
             PopupUtilsService.initListSectionItemListeners(document, angular);
         }, 500);
 
-        this.showOnLocked = !platformUtilsService.isFirefox() && !platformUtilsService.isEdge();
+        this.showOnLocked = !platformUtilsService.isFirefox() && !platformUtilsService.isEdge()
+            && !platformUtilsService.isSafari();
         this.storageService.get(constantsService.lockOptionKey).then((lockOption: number) => {
             if (lockOption != null) {
                 let option = lockOption.toString();