Skip to content

Commit 3419941

Browse files
committed
refactor: switched from private to protected to allow overriding the classes
1 parent f3a723c commit 3419941

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

projects/ngx-translate/src/lib/translate.directive.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ interface ExtendedNode extends Text {
3333
standalone: true,
3434
})
3535
export class TranslateDirective implements AfterViewChecked, OnDestroy {
36-
private translateService: TranslateService = inject(TranslateService);
37-
private element: ElementRef = inject(ElementRef);
38-
private _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
39-
40-
private key!: string;
41-
private lastParams?: InterpolationParameters;
42-
private currentParams?: InterpolationParameters;
43-
private readonly onLangChangeSub!: Subscription;
44-
private readonly onFallbackLangChangeSub!: Subscription;
45-
private readonly onTranslationChangeSub!: Subscription;
36+
protected translateService: TranslateService = inject(TranslateService);
37+
protected element: ElementRef = inject(ElementRef);
38+
protected _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
39+
40+
protected key!: string;
41+
protected lastParams?: InterpolationParameters;
42+
protected currentParams?: InterpolationParameters;
43+
protected readonly onLangChangeSub!: Subscription;
44+
protected readonly onFallbackLangChangeSub!: Subscription;
45+
protected readonly onTranslationChangeSub!: Subscription;
4646

4747
@Input() set translate(key: string) {
4848
if (key) {

projects/ngx-translate/src/lib/translate.pipe.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import { equals, isDefinedAndNotNull, isDict, isString } from "./util";
2424
pure: false, // required to update the value when the promise is resolved
2525
})
2626
export class TranslatePipe implements PipeTransform, OnDestroy {
27-
private translate: TranslateService = inject(TranslateService);
28-
private _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
27+
protected translate: TranslateService = inject(TranslateService);
28+
protected _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
2929

30-
private value: StrictTranslation = "";
30+
protected value: StrictTranslation = "";
3131
lastKey: string | null = null;
3232
lastParams: InterpolationParameters[] = [];
3333
onTranslationChange: Subscription | undefined;
@@ -140,7 +140,7 @@ export class TranslatePipe implements PipeTransform, OnDestroy {
140140
/**
141141
* Clean any existing subscription to change events
142142
*/
143-
private _dispose(): void {
143+
protected _dispose(): void {
144144
if (typeof this.onTranslationChange !== "undefined") {
145145
this.onTranslationChange.unsubscribe();
146146
this.onTranslationChange = undefined;

projects/ngx-translate/src/lib/translate.service.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,18 @@ export abstract class ITranslateService {
174174

175175
@Injectable()
176176
export class TranslateService implements ITranslateService, OnDestroy {
177-
private loadingTranslations!: Observable<InterpolatableTranslationObject>;
178-
private pending = false;
179-
private _translationRequests: Record<Language, Observable<TranslationObject>> = {};
180-
private lastUseLanguage: Language | null = null;
177+
protected loadingTranslations!: Observable<InterpolatableTranslationObject>;
178+
protected pending = false;
179+
protected _translationRequests: Record<Language, Observable<TranslationObject>> = {};
180+
protected lastUseLanguage: Language | null = null;
181181

182182
protected currentLoader = inject(TranslateLoader);
183183
protected compiler = inject(TranslateCompiler);
184-
private parser = inject(TranslateParser);
185-
private missingTranslationHandler = inject(MissingTranslationHandler);
186-
private store: TranslateStore = inject(TranslateStore);
184+
protected parser = inject(TranslateParser);
185+
protected missingTranslationHandler = inject(MissingTranslationHandler);
186+
protected store: TranslateStore = inject(TranslateStore);
187187

188-
private readonly extend: boolean = false;
188+
protected readonly extend: boolean = false;
189189

190190
/**
191191
* An Observable to listen to translation change events
@@ -314,7 +314,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
314314
/**
315315
* Retrieves the given translations
316316
*/
317-
private loadOrExtendLanguage(lang: Language): Observable<TranslationObject> | undefined {
317+
protected loadOrExtendLanguage(lang: Language): Observable<TranslationObject> | undefined {
318318
// if this language is unavailable or extend is true, ask for it
319319
if (!this.store.hasTranslationFor(lang) || this.extend) {
320320
this._translationRequests[lang] =
@@ -328,7 +328,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
328328
/**
329329
* Changes the current lang
330330
*/
331-
private changeLang(lang: Language): void {
331+
protected changeLang(lang: Language): void {
332332
if (lang !== this.lastUseLanguage) {
333333
// received new language data,
334334
// but this was not the one requested last
@@ -342,7 +342,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
342342
return this.store.getCurrentLang();
343343
}
344344

345-
private loadAndCompileTranslations(
345+
protected loadAndCompileTranslations(
346346
lang: Language,
347347
): Observable<InterpolatableTranslationObject> {
348348
this.pending = true;
@@ -410,7 +410,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
410410
this.store.addLanguages(languages);
411411
}
412412

413-
private getParsedResultForKey(
413+
protected getParsedResultForKey(
414414
key: string,
415415
interpolateParams?: InterpolationParameters,
416416
): StrictTranslation | Observable<StrictTranslation> {
@@ -436,11 +436,11 @@ export class TranslateService implements ITranslateService, OnDestroy {
436436
return this.store.getFallbackLang();
437437
}
438438

439-
private getTextToInterpolate(key: string): InterpolatableTranslation | undefined {
439+
protected getTextToInterpolate(key: string): InterpolatableTranslation | undefined {
440440
return this.store.getTranslation(key);
441441
}
442442

443-
private runInterpolation(
443+
protected runInterpolation(
444444
translations: InterpolatableTranslation,
445445
interpolateParams?: InterpolationParameters,
446446
): StrictTranslation {
@@ -459,7 +459,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
459459
return this.parser.interpolate(translations, interpolateParams);
460460
}
461461

462-
private runInterpolationOnArray(
462+
protected runInterpolationOnArray(
463463
translations: InterpolatableTranslation,
464464
interpolateParams: InterpolationParameters | undefined,
465465
) {
@@ -468,7 +468,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
468468
);
469469
}
470470

471-
private runInterpolationOnDict(
471+
protected runInterpolationOnDict(
472472
translations: InterpolatableTranslationObject,
473473
interpolateParams: InterpolationParameters | undefined,
474474
) {
@@ -494,7 +494,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
494494
: this.getParsedResultForKey(key, interpolateParams);
495495
}
496496

497-
private getParsedResultForArray(
497+
protected getParsedResultForArray(
498498
key: string[],
499499
interpolateParams: InterpolationParameters | undefined,
500500
) {

projects/ngx-translate/src/lib/translate.store.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ interface LoaderReference {
2222

2323
@Injectable()
2424
export class TranslateStore {
25-
private _onTranslationChange: Subject<TranslationChangeEvent> =
25+
protected _onTranslationChange: Subject<TranslationChangeEvent> =
2626
new Subject<TranslationChangeEvent>();
27-
private _onLangChange: Subject<LangChangeEvent> = new Subject<LangChangeEvent>();
28-
private _onFallbackLangChange: Subject<FallbackLangChangeEvent> =
27+
protected _onLangChange: Subject<LangChangeEvent> = new Subject<LangChangeEvent>();
28+
protected _onFallbackLangChange: Subject<FallbackLangChangeEvent> =
2929
new Subject<FallbackLangChangeEvent>();
3030

31-
private fallbackLang: Language | null = null;
32-
private currentLang!: Language;
31+
protected fallbackLang: Language | null = null;
32+
protected currentLang!: Language;
3333

34-
private translations: Record<Language, InterpolatableTranslationObject> = {};
35-
private languages: Language[] = [];
34+
protected translations: Record<Language, InterpolatableTranslationObject> = {};
35+
protected languages: Language[] = [];
3636

37-
private loaders: LoaderReference[] = [];
37+
protected loaders: LoaderReference[] = [];
3838

3939
public addLoader(loader: TranslateLoader): void {
4040
const existingLoader = this.getLoaderRef(loader);
@@ -55,7 +55,7 @@ export class TranslateStore {
5555
}
5656
}
5757

58-
private getLoaderRef(loader: TranslateLoader): LoaderReference | undefined {
58+
protected getLoaderRef(loader: TranslateLoader): LoaderReference | undefined {
5959
return this.loaders.find((ref) => ref.loader === loader);
6060
}
6161

0 commit comments

Comments
 (0)