This commit is contained in:
Kyle Spearrin 2019-06-04 00:00:46 -04:00
parent 89c066069c
commit 0ed33a07d8
4 changed files with 8 additions and 19 deletions

2
jslib

@ -1 +1 @@
Subproject commit 3d93696fb51b6a0c3d29c6df626e60fab9cca789
Subproject commit 802d38f52e9794567179b9bd9ffc475ceb31323f

View File

@ -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">

View File

@ -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);
}

View File

@ -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"
}
}
},