logged in as on

This commit is contained in:
Kyle Spearrin 2019-06-04 00:06:15 -04:00
parent dad084b309
commit e7b2557bcd
4 changed files with 13 additions and 6 deletions

2
jslib

@ -1 +1 @@
Subproject commit cd46f64993545a1cb772e2f6a2137a675554f3c3 Subproject commit 802d38f52e9794567179b9bd9ffc475ceb31323f

View File

@ -19,7 +19,9 @@
[ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i> [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
</button> </button>
</div> </div>
<small class="text-muted form-text">{{'loggedInAsEmail' | i18n : email}}</small> <small class="text-muted form-text">
{{'loggedInAsEmailOn' | i18n : email : webVaultHostname}}
</small>
</div> </div>
<hr> <hr>
<div class="d-flex"> <div class="d-flex">

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';
@ -22,9 +23,9 @@ export class LockComponent extends BaseLockComponent {
platformUtilsService: PlatformUtilsService, messagingService: MessagingService, platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
userService: UserService, cryptoService: CryptoService, userService: UserService, cryptoService: CryptoService,
storageService: StorageService, lockService: LockService, storageService: StorageService, lockService: LockService,
private routerService: RouterService) { environmentService: EnvironmentService, private routerService: RouterService) {
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService, super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
storageService, lockService); storageService, lockService, environmentService);
} }
async ngOnInit() { async ngOnInit() {

View File

@ -589,12 +589,16 @@
"unlock": { "unlock": {
"message": "Unlock" "message": "Unlock"
}, },
"loggedInAsEmail": { "loggedInAsEmailOn": {
"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"
} }
} }
}, },