bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

Revert "[EC-772] Add i18n key typechecking in web (#4023)" (#4296)

Browse Source 
This reverts commit 5a1940f3f4.
This commit is contained in:
Robyn MacCallum
2022-12-21 17:46:23 -05:00
committed by GitHub
parent eeb407b8a4
commit 3a98b415b0
50 changed files with 109 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/angular/src/pipes/i18n.pipe.ts
View File

@@ -5,10 +5,10 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@Pipe({
name: "i18n",
})
export class I18nPipe<TKey = string> implements PipeTransform {
constructor(private i18nService: I18nService<TKey>) {}
export class I18nPipe implements PipeTransform {
constructor(private i18nService: I18nService) {}
transform(id: TKey, p1?: string | number, p2?: string | number, p3?: string | number): string {
transform(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
return this.i18nService.t(id, p1, p2, p3);
}
}

3
libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts
View File

@@ -1,8 +1,7 @@
import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
export type TopLevelTreeNodeId = "vaults" | "types" | "collections" | "folders";
export type TopLevelTreeNodeName = "allVaults" | "types" | "collections" | "folders";
export class TopLevelTreeNode implements ITreeNodeObject {
id: TopLevelTreeNodeId;
name: TopLevelTreeNodeName; // localizationString
name: string; // localizationString
}

6
libs/common/src/abstractions/i18n.service.ts
View File

@@ -1,11 +1,11 @@
import { Observable } from "rxjs";
export abstract class I18nService<TKey = string> {
export abstract class I18nService {
locale$: Observable<string>;
supportedTranslationLocales: string[];
translationLocale: string;
collator: Intl.Collator;
localeNames: Map<string, string>;
t: (id: TKey, p1?: string | number, p2?: string | number, p3?: string | number) => string;
translate: (id: TKey, p1?: string, p2?: string, p3?: string) => string;
t: (id: string, p1?: string | number, p2?: string | number, p3?: string | number) => string;
translate: (id: string, p1?: string, p2?: string, p3?: string) => string;
}

8
libs/common/src/models/response/plan.response.ts
View File

@@ -8,12 +8,8 @@ export class PlanResponse extends BaseResponse {
product: ProductType;
name: string;
isAnnual: boolean;
nameLocalizationKey: "planNameFree" | "planNameFamilies" | "planNameTeams" | "planNameEnterprise";
descriptionLocalizationKey:
| "planDescFree"
| "planDescFamilies"
| "planDescTeams"
| "planDescEnterprise";
nameLocalizationKey: string;
descriptionLocalizationKey: string;
canBeUsedByBusiness: boolean;
baseSeats: number;
baseStorageGb: number;

2
libs/common/src/models/response/subscription.response.ts
View File

@@ -60,7 +60,7 @@ export class BillingSubscriptionItemResponse extends BaseResponse {
name: string;
amount: number;
quantity: number;
interval: "month" | "year";
interval: string;
sponsoredSubscriptionItem: boolean;
constructor(response: any) {

8
libs/common/src/services/i18n.service.implementation.ts → libs/common/src/services/i18n.service.ts
View File

@@ -1,8 +1,8 @@
import { Observable, ReplaySubject } from "rxjs";
import { I18nService } from "../abstractions/i18n.service";
import { I18nService as I18nServiceAbstraction } from "../abstractions/i18n.service";
export class I18nServiceImplementation<TKey = string> implements I18nService<TKey> {
export class I18nService implements I18nServiceAbstraction {
private _locale = new ReplaySubject<string>(1);
locale$: Observable<string> = this._locale.asObservable();
// First locale is the default (English)
@@ -118,11 +118,11 @@ export class I18nServiceImplementation<TKey = string> implements I18nService<TKe
}
}
t(id: TKey, p1?: string, p2?: string, p3?: string): string {
t(id: string, p1?: string, p2?: string, p3?: string): string {
return this.translate(id, p1, p2, p3);
}
translate(id: TKey, p1?: string | number, p2?: string | number, p3?: string | number): string {
translate(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
let result: string;
// eslint-disable-next-line
if (this.localeMessages.hasOwnProperty(id) && this.localeMessages[id]) {