logged in as on

This commit is contained in:
Kyle Spearrin 2019-06-04 00:03:27 -04:00
parent a60c60529f
commit fe3c611d5a
4 changed files with 12 additions and 6 deletions

2
jslib

@ -1 +1 @@
Subproject commit 38fc0432c3b352628b0114ac98b49ca69ee01675 Subproject commit 802d38f52e9794567179b9bd9ffc475ceb31323f

View File

@ -298,12 +298,16 @@
"unlock": { "unlock": {
"message": "Unlock" "message": "Unlock"
}, },
"loggedInAs": { "loggedInAsOn": {
"message": "Logged in as $EMAIL$.", "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
"placeholders": { "placeholders": {
"email": { "email": {
"content": "$1", "content": "$1",
"example": "name@example.com" "example": "name@example.com"
},
"hostname": {
"content": "$2",
"example": "bitwarden.com"
} }
} }
}, },

View File

@ -32,7 +32,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<p>{{(pinLock ? 'yourVaultIsLockedPinCode' : 'yourVaultIsLocked') | i18n}}</p> <p>{{(pinLock ? 'yourVaultIsLockedPinCode' : 'yourVaultIsLocked') | i18n}}</p>
{{'loggedInAs' | i18n : email}} {{'loggedInAsOn' | i18n : email : webVaultHostname}}
</div> </div>
</div> </div>
<p class="text-center"> <p class="text-center">

View File

@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib/abstractions/crypto.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib/abstractions/i18n.service';
import { LockService } from 'jslib/abstractions/lock.service'; import { LockService } from 'jslib/abstractions/lock.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib/abstractions/messaging.service';
@ -19,9 +20,10 @@ export class LockComponent extends BaseLockComponent {
constructor(router: Router, i18nService: I18nService, constructor(router: Router, i18nService: I18nService,
platformUtilsService: PlatformUtilsService, messagingService: MessagingService, platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
userService: UserService, cryptoService: CryptoService, userService: UserService, cryptoService: CryptoService,
storageService: StorageService, lockService: LockService) { storageService: StorageService, lockService: LockService,
environmentService: EnvironmentService) {
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService, super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
storageService, lockService); storageService, lockService, environmentService);
this.successRoute = '/tabs/current'; this.successRoute = '/tabs/current';
} }