mirror of
https://github.com/bitwarden/desktop.git
synced 2024-11-24 11:55:50 +01:00
If an environment is configured, show the hostname in the lock screen (#258)
* If an environment is configured, show the hostname in the lock screen. * Restore back src/locales/en_GB/messages.json
This commit is contained in:
parent
e7b0f19765
commit
89c066069c
@ -24,7 +24,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<div class="box-footer" *ngIf="webVaultHostname">
|
||||
{{'loggedInAsOn' | i18n : email:webVaultHostname}}
|
||||
</div>
|
||||
<div class="box-footer" *ngIf="!webVaultHostname">
|
||||
{{'loggedInAs' | i18n : email}}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,6 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
import { EnvironmentService } from 'jslib/abstractions/environment.service';
|
||||
import { CryptoService } from 'jslib/abstractions/crypto.service';
|
||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||
import { LockService } from 'jslib/abstractions/lock.service';
|
||||
@ -19,8 +20,8 @@ export class LockComponent extends BaseLockComponent {
|
||||
constructor(router: Router, i18nService: I18nService,
|
||||
platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
|
||||
userService: UserService, cryptoService: CryptoService,
|
||||
storageService: StorageService, lockService: LockService) {
|
||||
storageService: StorageService, lockService: LockService, environmentService: EnvironmentService) {
|
||||
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
|
||||
storageService, lockService);
|
||||
storageService, lockService, environmentService);
|
||||
}
|
||||
}
|
||||
|
@ -749,6 +749,19 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"loggedInAsOn": {
|
||||
"message": "Logged in as $EMAIL$ on $WEBVAULTHOSTNAME$.",
|
||||
"placeholders": {
|
||||
"email": {
|
||||
"content": "$1",
|
||||
"example": "name@example.com"
|
||||
},
|
||||
"webVaultHostname": {
|
||||
"content": "$2",
|
||||
"example": "bitwarden.example.com"
|
||||
}
|
||||
}
|
||||
},
|
||||
"invalidMasterPassword": {
|
||||
"message": "Invalid master password"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user