From 6e0f7bcab0009b20b87691d53c8d95db50ac50e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2026 09:22:46 +0000 Subject: [PATCH 1/2] chore(deps): bump @ngx-translate/core from 17.0.0 to 18.0.0 Bumps [@ngx-translate/core](https://github.com/ngx-translate/core) from 17.0.0 to 18.0.0. - [Release notes](https://github.com/ngx-translate/core/releases) - [Commits](https://github.com/ngx-translate/core/compare/v17.0.0...v18.0.0) --- updated-dependencies: - dependency-name: "@ngx-translate/core" dependency-version: 18.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 13 +++++++------ package.json | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index c04e4e2b0..44ebe9d5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@ngrx/operators": "^19.1.0", "@ngrx/router-store": "^19.1.0", "@ngrx/store": "^19.1.0", - "@ngx-translate/core": "^17.0.0", + "@ngx-translate/core": "^18.0.0", "@ngxmc/datetime-picker": "^19.3.1", "@scicatproject/scicat-sdk-ts-angular": "^5.1.1", "ajv": "^8.18.0", @@ -6240,16 +6240,17 @@ } }, "node_modules/@ngx-translate/core": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-17.0.0.tgz", - "integrity": "sha512-Rft2D5ns2pq4orLZjEtx1uhNuEBerUdpFUG1IcqtGuipj6SavgB8SkxtNQALNDA+EVlvsNCCjC2ewZVtUeN6rg==", + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-18.0.0.tgz", + "integrity": "sha512-Z9u9AXaeuyeHHimivvJQvhal/LJNB+5tlH+FimSU4QQ61FrtRDqgyn6nfFbc6Cb+59NDZdsh4QeTJyPCldFUwA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">=16", - "@angular/core": ">=16" + "@angular/common": ">=18", + "@angular/core": ">=18", + "rxjs": ">=7" } }, "node_modules/@ngxmc/datetime-picker": { diff --git a/package.json b/package.json index bc18a86d3..4f296f9c0 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@ngrx/operators": "^19.1.0", "@ngrx/router-store": "^19.1.0", "@ngrx/store": "^19.1.0", - "@ngx-translate/core": "^17.0.0", + "@ngx-translate/core": "^18.0.0", "@ngxmc/datetime-picker": "^19.3.1", "@scicatproject/scicat-sdk-ts-angular": "^5.1.1", "ajv": "^8.18.0", From de4f0eedd25f5140d260299ab517970c6493f8da Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 3 Jul 2026 11:27:24 +0200 Subject: [PATCH 2/2] update translateService api --- src/app/app.module.ts | 16 ++++++++-------- src/app/shared/shared.module.ts | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e80715c74..952201240 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -32,7 +32,7 @@ import { AuthInterceptor } from "shared/interceptors/auth.interceptor"; import { AuthService } from "shared/services/auth/auth.service"; import { InternalStorage, SDKStorage } from "shared/services/auth/base.storage"; import { CookieService } from "ngx-cookie-service"; -import { TranslateLoader, TranslateModule } from "@ngx-translate/core"; +import { provideTranslateService, TranslateLoader } from "@ngx-translate/core"; import { CustomTranslateLoader } from "shared/loaders/custom-translate.loader"; import { DATE_PIPE_DEFAULT_OPTIONS } from "@angular/common"; import { RouteTrackerService } from "shared/services/route-tracker.service"; @@ -62,13 +62,6 @@ const apiConfigurationFn = ( imports: [ AppConfigModule, AppRoutingModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: CustomTranslateLoader, - deps: [AppConfigService], - }, - }), BrowserAnimationsModule, BrowserModule, LayoutModule, @@ -107,6 +100,13 @@ const apiConfigurationFn = ( provideAppInitializer(() => { inject(RouteTrackerService); }), + provideTranslateService({ + loader: { + provide: TranslateLoader, + useClass: CustomTranslateLoader, + deps: [AppConfigService], + }, + }), provideRouter(routes), { provide: HTTP_INTERCEPTORS, diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index fc9e3c043..26a843fc4 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -27,7 +27,6 @@ import { ConfigurableActionsModule } from "./modules/configurable-actions/config import { NgxNumericRangeFormFieldModule } from "./modules/numeric-range/ngx-numeric-range-form-field.module"; import { EmptyContentModule } from "./modules/generic-empty-content/empty-content.module"; import { JsonformsAccordionRendererService } from "./services/jsonforms-accordion-renderer.service"; -import { TranslateModule } from "@ngx-translate/core"; import { JsonPreviewDialogModule } from "./modules/json-preview-dialog/json-preview-dialog.module"; import { DatasetsListService } from "./services/datasets-list.service"; import { AjvService } from "./services/ajv.service"; @@ -50,7 +49,6 @@ import { AjvService } from "./services/ajv.service"; SharedTableModule, ScientificMetadataTreeModule, DynamicMatTableModule.forRoot({}), - TranslateModule, ConfigurableActionsModule, NgxNumericRangeFormFieldModule, EmptyContentModule,