Skip to content

Commit f691f73

Browse files
committed
refactor(setTranslations): remove not used extend
1 parent b9f0bdf commit f691f73

File tree

2 files changed

+25
-31
lines changed

2 files changed

+25
-31
lines changed

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
2-
computed,
3-
inject,
4-
Injectable,
5-
InjectionToken,
6-
isSignal,
7-
Signal,
8-
signal,
2+
computed,
3+
inject,
4+
Injectable,
5+
InjectionToken,
6+
isSignal,
7+
Signal,
8+
signal,
99
} from "@angular/core";
1010
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
1111
import { concat, defer, EMPTY, finalize, forkJoin, isObservable, merge, Observable, of, Subject, tap } from "rxjs";
@@ -14,22 +14,22 @@ import { DefaultMissingTranslationHandler, MissingTranslationHandler } from "./m
1414
import { TranslateCompiler } from "./translate.compiler";
1515
import { TranslateLoader } from "./translate.loader";
1616
import { TranslateParser } from "./translate.parser";
17-
import { DeepReadonly, TranslateStore } from "./translate.store";
18-
import { insertValue, isArray, isDefinedAndNotNull, isDict, isString } from "./util";
1917
import {
20-
DefaultLangChangeEvent,
21-
FallbackLangChangeEvent,
22-
InterpolatableTranslation,
23-
InterpolatableTranslationObject,
24-
InterpolationParameters,
25-
ITranslateService,
26-
LangChangeEvent,
27-
Language,
28-
StrictTranslation,
29-
Translation,
30-
TranslationChangeEvent,
31-
TranslationObject,
18+
DefaultLangChangeEvent,
19+
FallbackLangChangeEvent,
20+
InterpolatableTranslation,
21+
InterpolatableTranslationObject,
22+
InterpolationParameters,
23+
ITranslateService,
24+
LangChangeEvent,
25+
Language,
26+
StrictTranslation,
27+
Translation,
28+
TranslationChangeEvent,
29+
TranslationObject,
3230
} from "./translate.service.interface";
31+
import { DeepReadonly, TranslateStore } from "./translate.store";
32+
import { insertValue, isArray, isDefinedAndNotNull, isDict, isString } from "./util";
3333

3434
/**
3535
* Configuration object for the translation service.
@@ -329,7 +329,7 @@ export class TranslateService implements ITranslateService {
329329
const translations$ = this.currentLoader.getTranslation(lang).pipe(
330330
map((res: TranslationObject) => this.compiler.compileTranslations(res, lang)),
331331
tap((compiled: InterpolatableTranslationObject) => {
332-
this.store.setTranslations(lang, compiled, false);
332+
this.store.setTranslations(lang, compiled);
333333
}),
334334
finalize(() => {
335335
delete this.loadingTranslations[lang];
@@ -358,11 +358,10 @@ export class TranslateService implements ITranslateService {
358358
public setTranslation(
359359
lang: Language,
360360
translations: TranslationObject,
361-
shouldMerge = false,
362361
): void {
363362
const interpolatableTranslations: InterpolatableTranslationObject =
364363
this.compiler.compileTranslations(translations, lang);
365-
this.store.setTranslations(lang, interpolatableTranslations, shouldMerge);
364+
this.store.setTranslations(lang, interpolatableTranslations);
366365
}
367366

368367
public getLangs(): readonly Language[] {
@@ -673,7 +672,6 @@ export class TranslateService implements ITranslateService {
673672
? this.compiler.compile(translation, lang)
674673
: this.compiler.compileTranslations(translation, lang),
675674
),
676-
false,
677675
);
678676
}
679677

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Injectable } from "@angular/core";
22
import { Observable, Subject } from "rxjs";
3-
import { getValue, mergeDeep } from "./util";
43
import {
54
InterpolatableTranslation,
65
InterpolatableTranslationObject,
76
Language,
87
TranslationChangeEvent,
98
} from "./translate.service.interface";
9+
import { getValue } from "./util";
1010

1111
export type DeepReadonly<T> = {
1212
readonly [K in keyof T]: T[K] extends object ? DeepReadonly<T[K]> : T[K];
@@ -27,12 +27,8 @@ export class TranslateStore {
2727
public setTranslations(
2828
language: Language,
2929
translations: InterpolatableTranslationObject,
30-
extend: boolean,
3130
): void {
32-
this.translations[language] =
33-
extend && this.hasTranslationFor(language)
34-
? mergeDeep(this.translations[language], translations)
35-
: translations;
31+
this.translations[language] = translations;
3632
this.addLanguages([language]);
3733
this._onTranslationChange.next({
3834
lang: language,

0 commit comments

Comments
 (0)