1
0
mirror of https://github.com/bitwarden/browser synced 2026-01-05 01:53:55 +00:00

[PS-713] Fix locale search bug (#3014)

* [PS-713] Fix locale search bug

* [PS-713] Add new locales to start at 1 char search

* [PS-713] Switch to ReplaySubject and other edits from PR comments

* PS-713: Add destroy to other sub and make locale inline a const

* PS-713: Use firstValueFrom instead of takeUntil

* PS-713: get this.locale asynchronously

Co-authored-by: Colton Hurst <churst@bitwarden.com>
This commit is contained in:
Colton Hurst
2022-07-12 09:02:19 -04:00
committed by GitHub
parent 35adf9d6e9
commit 59eac668a7
6 changed files with 42 additions and 13 deletions

View File

@@ -1,5 +1,6 @@
import { formatDate } from "@angular/common";
import { Component, EventEmitter, Input, Output, OnInit } from "@angular/core";
import { firstValueFrom } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -23,6 +24,8 @@ export class SponsoringOrgRowComponent implements OnInit {
revokeSponsorshipPromise: Promise<any>;
resendEmailPromise: Promise<any>;
private locale = "";
constructor(
private apiService: ApiService,
private i18nService: I18nService,
@@ -30,7 +33,9 @@ export class SponsoringOrgRowComponent implements OnInit {
private platformUtilsService: PlatformUtilsService
) {}
ngOnInit(): void {
async ngOnInit() {
this.locale = await firstValueFrom(this.i18nService.locale$);
this.setStatus(
this.isSelfHosted,
this.sponsoringOrg.familySponsorshipToDelete,
@@ -98,7 +103,7 @@ export class SponsoringOrgRowComponent implements OnInit {
// They want to delete but there is a valid until date which means there is an active sponsorship
this.statusMessage = this.i18nService.t(
"revokeWhenExpired",
formatDate(validUntil, "MM/dd/yyyy", this.i18nService.locale)
formatDate(validUntil, "MM/dd/yyyy", this.locale)
);
this.statusClass = "text-danger";
} else if (toDelete) {