Skip to content

fix: make private properties and methods protected in order to allow usage in extending classes #1600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: make private properties and methods protected in order to allow usage in extending classes #1600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions projects/ngx-translate/src/lib/translate.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ interface ExtendedNode extends Text {
standalone: true,
})
export class TranslateDirective implements AfterViewChecked, OnDestroy {
private translateService: TranslateService = inject(TranslateService);
private element: ElementRef = inject(ElementRef);
private _ref: ChangeDetectorRef = inject(ChangeDetectorRef);

private key!: string;
private lastParams?: InterpolationParameters;
private currentParams?: InterpolationParameters;
private readonly onLangChangeSub!: Subscription;
private readonly onFallbackLangChangeSub!: Subscription;
private readonly onTranslationChangeSub!: Subscription;
protected translateService: TranslateService = inject(TranslateService);
protected element: ElementRef = inject(ElementRef);
protected _ref: ChangeDetectorRef = inject(ChangeDetectorRef);

protected key!: string;
protected lastParams?: InterpolationParameters;
protected currentParams?: InterpolationParameters;
protected readonly onLangChangeSub!: Subscription;
protected readonly onFallbackLangChangeSub!: Subscription;
protected readonly onTranslationChangeSub!: Subscription;

@Input() set translate(key: string) {
if (key) {
Expand Down
8 changes: 4 additions & 4 deletions projects/ngx-translate/src/lib/translate.pipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import { equals, isDefinedAndNotNull, isDict, isString } from "./util";
pure: false, // required to update the value when the promise is resolved
})
export class TranslatePipe implements PipeTransform, OnDestroy {
private translate: TranslateService = inject(TranslateService);
private _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
protected translate: TranslateService = inject(TranslateService);
protected _ref: ChangeDetectorRef = inject(ChangeDetectorRef);

private value: StrictTranslation = "";
protected value: StrictTranslation = "";
lastKey: string | null = null;
lastParams: InterpolationParameters[] = [];
onTranslationChange: Subscription | undefined;
Expand Down Expand Up @@ -140,7 +140,7 @@ export class TranslatePipe implements PipeTransform, OnDestroy {
/**
* Clean any existing subscription to change events
*/
private _dispose(): void {
protected _dispose(): void {
if (typeof this.onTranslationChange !== "undefined") {
this.onTranslationChange.unsubscribe();
this.onTranslationChange = undefined;
Expand Down
34 changes: 17 additions & 17 deletions projects/ngx-translate/src/lib/translate.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,18 @@ export abstract class ITranslateService {

@Injectable()
export class TranslateService implements ITranslateService {
private loadingTranslations!: Observable<InterpolatableTranslationObject>;
private pending = false;
private _translationRequests: Record<Language, Observable<TranslationObject>> = {};
private lastUseLanguage: Language | null = null;
protected loadingTranslations!: Observable<InterpolatableTranslationObject>;
protected pending = false;
protected _translationRequests: Record<Language, Observable<TranslationObject>> = {};
protected lastUseLanguage: Language | null = null;

protected currentLoader = inject(TranslateLoader);
protected compiler = inject(TranslateCompiler);
private parser = inject(TranslateParser);
private missingTranslationHandler = inject(MissingTranslationHandler);
private store: TranslateStore = inject(TranslateStore);
protected parser = inject(TranslateParser);
protected missingTranslationHandler = inject(MissingTranslationHandler);
protected store: TranslateStore = inject(TranslateStore);

private readonly extend: boolean = false;
protected readonly extend: boolean = false;

/**
* An Observable to listen to translation change events
Expand Down Expand Up @@ -308,7 +308,7 @@ export class TranslateService implements ITranslateService {
/**
* Retrieves the given translations
*/
private loadOrExtendLanguage(lang: Language): Observable<TranslationObject> | undefined {
protected loadOrExtendLanguage(lang: Language): Observable<TranslationObject> | undefined {
// if this language is unavailable or extend is true, ask for it
if (!this.store.hasTranslationFor(lang) || this.extend) {
this._translationRequests[lang] =
Expand All @@ -322,7 +322,7 @@ export class TranslateService implements ITranslateService {
/**
* Changes the current lang
*/
private changeLang(lang: Language): void {
protected changeLang(lang: Language): void {
if (lang !== this.lastUseLanguage) {
// received new language data,
// but this was not the one requested last
Expand All @@ -336,7 +336,7 @@ export class TranslateService implements ITranslateService {
return this.store.getCurrentLang();
}

private loadAndCompileTranslations(
protected loadAndCompileTranslations(
lang: Language,
): Observable<InterpolatableTranslationObject> {
this.pending = true;
Expand Down Expand Up @@ -390,7 +390,7 @@ export class TranslateService implements ITranslateService {
this.store.addLanguages(languages);
}

private getParsedResultForKey(
protected getParsedResultForKey(
key: string,
interpolateParams?: InterpolationParameters,
): StrictTranslation | Observable<StrictTranslation> {
Expand All @@ -416,11 +416,11 @@ export class TranslateService implements ITranslateService {
return this.store.getFallbackLang();
}

private getTextToInterpolate(key: string): InterpolatableTranslation | undefined {
protected getTextToInterpolate(key: string): InterpolatableTranslation | undefined {
return this.store.getTranslation(key);
}

private runInterpolation(
protected runInterpolation(
translations: InterpolatableTranslation,
interpolateParams?: InterpolationParameters,
): StrictTranslation {
Expand All @@ -439,7 +439,7 @@ export class TranslateService implements ITranslateService {
return this.parser.interpolate(translations, interpolateParams);
}

private runInterpolationOnArray(
protected runInterpolationOnArray(
translations: InterpolatableTranslation,
interpolateParams: InterpolationParameters | undefined,
) {
Expand All @@ -448,7 +448,7 @@ export class TranslateService implements ITranslateService {
);
}

private runInterpolationOnDict(
protected runInterpolationOnDict(
translations: InterpolatableTranslationObject,
interpolateParams: InterpolationParameters | undefined,
) {
Expand All @@ -474,7 +474,7 @@ export class TranslateService implements ITranslateService {
: this.getParsedResultForKey(key, interpolateParams);
}

private getParsedResultForArray(
protected getParsedResultForArray(
key: string[],
interpolateParams: InterpolationParameters | undefined,
) {
Expand Down
14 changes: 7 additions & 7 deletions projects/ngx-translate/src/lib/translate.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ export type DeepReadonly<T> = {

@Injectable()
export class TranslateStore {
private _onTranslationChange: Subject<TranslationChangeEvent> =
protected _onTranslationChange: Subject<TranslationChangeEvent> =
new Subject<TranslationChangeEvent>();
private _onLangChange: Subject<LangChangeEvent> = new Subject<LangChangeEvent>();
private _onFallbackLangChange: Subject<FallbackLangChangeEvent> =
protected _onLangChange: Subject<LangChangeEvent> = new Subject<LangChangeEvent>();
protected _onFallbackLangChange: Subject<FallbackLangChangeEvent> =
new Subject<FallbackLangChangeEvent>();

private fallbackLang: Language | null = null;
private currentLang!: Language;
protected fallbackLang: Language | null = null;
protected currentLang!: Language;

private translations: Record<Language, InterpolatableTranslationObject> = {};
private languages: Language[] = [];
protected translations: Record<Language, InterpolatableTranslationObject> = {};
protected languages: Language[] = [];

public getTranslations(language: Language): DeepReadonly<InterpolatableTranslationObject> {
return this.translations[language];
Expand Down