From 0ed33a07d821e3e1c964a98109d5b0f304c34fe7 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 4 Jun 2019 00:00:46 -0400
Subject: [PATCH] cleanup

---
 jslib                                |  2 +-
 src/app/accounts/lock.component.html |  7 ++-----
 src/app/accounts/lock.component.ts   |  3 ++-
 src/locales/en/messages.json         | 15 +++------------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/jslib b/jslib
index 3d93696fb5..802d38f52e 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 3d93696fb51b6a0c3d29c6df626e60fab9cca789
+Subproject commit 802d38f52e9794567179b9bd9ffc475ceb31323f
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index 57f6f6055f..d80b2cbd5a 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -24,11 +24,8 @@
                     </div>
                 </div>
             </div>
-            <div class="box-footer" *ngIf="webVaultHostname">
-                {{'loggedInAsOn' | i18n : email:webVaultHostname}}
-            </div>
-            <div class="box-footer" *ngIf="!webVaultHostname">
-                {{'loggedInAs' | i18n : email}}
+            <div class="box-footer">
+                {{'loggedInAsOn' | i18n : email : webVaultHostname}}
             </div>
         </div>
         <div class="buttons">
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 3b8b3078c7..709459c502 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -20,7 +20,8 @@ export class LockComponent extends BaseLockComponent {
     constructor(router: Router, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
-        storageService: StorageService, lockService: LockService, environmentService: EnvironmentService) {
+        storageService: StorageService, lockService: LockService,
+        environmentService: EnvironmentService) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
             storageService, lockService, environmentService);
     }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index d7c52f85fc..794b746b63 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -740,25 +740,16 @@
   "unlock": {
     "message": "Unlock"
   },
-  "loggedInAs": {
-    "message": "Logged in as $EMAIL$.",
-    "placeholders": {
-      "email": {
-        "content": "$1",
-        "example": "name@example.com"
-      }
-    }
-  },
   "loggedInAsOn": {
-    "message": "Logged in as $EMAIL$ on $WEBVAULTHOSTNAME$.",
+    "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
         "example": "name@example.com"
       },
-      "webVaultHostname": {
+      "hostname": {
         "content": "$2",
-        "example": "bitwarden.example.com"
+        "example": "bitwarden.com"
       }
     }
   },