feat: remove the i18n service provider and just provide the service in

tom-wegener · tom-wegener · commit de227e4eed88 · 2025-09-03T11:11:44.000+02:00
root
diff --git a/src/breadcrumb/breadcrumb.component.ts b/src/breadcrumb/breadcrumb.component.ts
@@ -14,7 +14,7 @@ import {
 import { BreadcrumbItem } from "./breadcrumb-item.interface";
 import { BreadcrumbItemComponent } from "./breadcrumb-item.component";
 import { Router } from "@angular/router";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { NgClass, NgTemplateOutlet } from "@angular/common";
 import { IconDirective } from "carbon-components-angular/icon";
 import { OverflowMenu } from "carbon-components-angular/dialog";
@@ -129,7 +129,7 @@ const MINIMUM_OVERFLOW_THRESHOLD = 4;
 	`,
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
-	providers: [I18N_SERVICE_PROVIDER, EventService, DOCUMENT_SERVICE_PROVIDER],
+	providers: [EventService, DOCUMENT_SERVICE_PROVIDER],
 	imports: [NgClass, BreadcrumbItemComponent, NgTemplateOutlet, IconDirective, OverflowMenu]
 })
 export class Breadcrumb implements AfterContentInit {
diff --git a/src/breadcrumb/breadcrumb.stories.ts b/src/breadcrumb/breadcrumb.stories.ts
@@ -4,7 +4,6 @@ import {
 	BreadcrumbItemComponent,
 	BreadcrumbItem
 } from "./";
-import { I18N_SERVICE_PROVIDER } from "../i18n";
 
 let breadcrumbItems;
 
@@ -28,8 +27,7 @@ export default {
 			imports: [
 				Breadcrumb,
 				BreadcrumbItemComponent
-			],
-			providers: [I18N_SERVICE_PROVIDER]
+			]
 		})
 	],
 	args: {
diff --git a/src/code-snippet/code-snippet.component.ts b/src/code-snippet/code-snippet.component.ts
@@ -9,7 +9,7 @@ import {
 } from "@angular/core";
 
 import { BaseIconButton } from "carbon-components-angular/button";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
 import { NgTemplateOutlet, NgClass, NgStyle } from "@angular/common";
 import { IconDirective } from "carbon-components-angular/icon";
@@ -141,7 +141,7 @@ export enum SnippetType {
 	`,
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
-	providers: [I18N_SERVICE_PROVIDER, EventService, DOCUMENT_SERVICE_PROVIDER],
+	providers: [EventService, DOCUMENT_SERVICE_PROVIDER],
 	imports: [NgTemplateOutlet, NgClass, NgStyle, IconDirective, IconButton]
 })
 export class CodeSnippet extends BaseIconButton implements OnInit, AfterViewInit {
diff --git a/src/dialog/overflow-menu/overflow-menu-custom-pane.component.ts b/src/dialog/overflow-menu/overflow-menu-custom-pane.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, ElementRef, Optional } from "@angular/core";
 import { position } from "@carbon/utils-position";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { AnimationFrameService, AnimationFrameServiceSingleton, ElementService } from "carbon-components-angular/utils";
 import { closestAttr } from "carbon-components-angular/utils";
 import { CloseReasons } from "../dialog-config.interface";
@@ -28,7 +28,7 @@ import { NgClass, NgTemplateOutlet } from "@angular/common";
 		</div>
 	`,
 	standalone: true,
-	providers: [I18N_SERVICE_PROVIDER, ElementService, AnimationFrameService, AnimationFrameServiceSingleton],
+	providers: [ElementService, AnimationFrameService, AnimationFrameServiceSingleton],
 	imports: [NgClass, NgTemplateOutlet]
 })
 export class OverflowMenuCustomPane extends Dialog implements AfterViewInit {
diff --git a/src/dialog/overflow-menu/overflow-menu.component.ts b/src/dialog/overflow-menu/overflow-menu.component.ts
@@ -8,7 +8,7 @@ import {
 	TemplateRef,
 	ViewEncapsulation
 } from "@angular/core";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { OverflowMenuDirective } from "./overflow-menu.directive";
 import { BaseIconButton, Button } from "carbon-components-angular/button";
 import { Tooltip } from "carbon-components-angular/tooltip";
@@ -98,7 +98,7 @@ import { PlaceholderService } from "carbon-components-angular/placeholder";
 	`],
 	encapsulation: ViewEncapsulation.None,
 	standalone: true,
-	providers: [PlaceholderService, I18N_SERVICE_PROVIDER],
+	providers: [PlaceholderService],
 	imports: [Tooltip, Button, OverflowMenuDirective, NgClass, NgTemplateOutlet, IconDirective]
 })
 export class OverflowMenu extends BaseIconButton {
diff --git a/src/dropdown/dropdown.component.ts b/src/dropdown/dropdown.component.ts
@@ -26,7 +26,7 @@ import {
 } from "rxjs";
 
 import { AbstractDropdownView } from "./abstract-dropdown-view.class";
-import { I18n, I18N_SERVICE_PROVIDER } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { DropdownService } from "./dropdown.service";
 import {
 	AnimationFrameService,
@@ -226,8 +226,7 @@ import { PlaceholderService } from "carbon-components-angular/placeholder";
 		DropdownService,
 		ElementService,
 		EventService,
-		DOCUMENT_SERVICE_PROVIDER,
-		I18N_SERVICE_PROVIDER
+		DOCUMENT_SERVICE_PROVIDER
 	],
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
diff --git a/src/dropdown/list/dropdown-list.component.ts b/src/dropdown/list/dropdown-list.component.ts
@@ -21,7 +21,7 @@ import {
 } from "rxjs";
 import { first } from "rxjs/operators";
 
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { AbstractDropdownView } from "../abstract-dropdown-view.class";
 import { ListItem } from "../list-item.interface";
 import { watchFocusJump } from "../dropdowntools";
@@ -125,8 +125,7 @@ import { AnimationFrameService, AnimationFrameServiceSingleton } from "carbon-co
 		},
 		DropdownService,
 		AnimationFrameService,
-		AnimationFrameServiceSingleton,
-		I18N_SERVICE_PROVIDER
+		AnimationFrameServiceSingleton
 	],
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
diff --git a/src/i18n/i18n.module.ts b/src/i18n/i18n.module.ts
@@ -2,24 +2,11 @@ import { SkipSelf, Optional, NgModule } from "@angular/core";
 import { I18n } from "./i18n.service";
 import { ReplacePipe } from "./replace.pipe";
 
-// either provides a new instance of I18n, or returns the parent
-export function I18N_SERVICE_PROVIDER_FACTORY(parentService: I18n) {
-	return parentService || new I18n();
-}
-
-// I18n should provide a single instance of itself to ensure that translations are consistent through the app
-export const I18N_SERVICE_PROVIDER = {
-	provide: I18n,
-	deps: [[new Optional(), new SkipSelf(), I18n]],
-	useFactory: I18N_SERVICE_PROVIDER_FACTORY
-};
-
 @NgModule({
 	imports: [ReplacePipe],
 	exports: [ReplacePipe],
 	providers: [
-		I18n,
-		I18N_SERVICE_PROVIDER
+		I18n
 	]
 })
 export class I18nModule {}
diff --git a/src/notification/actionable-notification.component.ts b/src/notification/actionable-notification.component.ts
@@ -6,7 +6,7 @@ import {
 
 import { isObservable, of } from "rxjs";
 import { ActionableContent, NotificationVariants } from "./notification-content.interface";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { NotificationDisplayService } from "./notification-display.service";
 import { BaseNotification } from "./base-notification.component";
 import { IconDirective } from "carbon-components-angular/icon";
@@ -75,7 +75,7 @@ import { Button } from "carbon-components-angular/button";
 		}
 	`,
 	standalone: true,
-	providers: [NotificationDisplayService, I18N_SERVICE_PROVIDER],
+	providers: [NotificationDisplayService],
 	imports: [IconDirective, NgClass, ActionableTitle, ActionableSubtitle, Link, NgTemplateOutlet, ActionableButton, Button, AsyncPipe]
 })
 export class ActionableNotification extends BaseNotification {
diff --git a/src/notification/notification.component.ts b/src/notification/notification.component.ts
@@ -5,7 +5,7 @@ import {
 } from "@angular/core";
 
 import { NotificationContent } from "./notification-content.interface";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { NotificationDisplayService } from "./notification-display.service";
 import { isObservable, of } from "rxjs";
 import { BaseNotification } from "./base-notification.component";
@@ -51,7 +51,7 @@ import { NgTemplateOutlet, AsyncPipe } from "@angular/common";
 		}
 	`,
 	standalone: true,
-	providers: [NotificationDisplayService, I18N_SERVICE_PROVIDER],
+	providers: [NotificationDisplayService],
 	imports: [IconDirective, NotificationTitle, NotificationSubtitle, NgTemplateOutlet, AsyncPipe]
 })
 export class Notification extends BaseNotification {
diff --git a/src/notification/toast.component.ts b/src/notification/toast.component.ts
@@ -8,7 +8,7 @@ import {
 import { isObservable, of } from "rxjs";
 import { ToastContent } from "./notification-content.interface";
 import { NotificationDisplayService } from "./notification-display.service";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { BaseNotification } from "./base-notification.component";
 import { IconDirective } from "carbon-components-angular/icon";
 import { ToastTitle } from "./toast-title.directive";
@@ -53,7 +53,7 @@ import { NotificationService } from "./notification.service";
 		}
 	`,
 	standalone: true,
-	providers: [NotificationDisplayService, I18N_SERVICE_PROVIDER],
+	providers: [NotificationDisplayService],
 	imports: [IconDirective, ToastTitle, ToastSubtitle, ToastCaption, NgTemplateOutlet, AsyncPipe]
 })
 export class Toast extends BaseNotification implements OnInit {
diff --git a/src/pagination/pagination-nav.stories.ts b/src/pagination/pagination-nav.stories.ts
@@ -6,7 +6,6 @@ import {
 	PaginationOverflow } from "./";
 
 import { PaginationNavStory } from "./pagination-nav/stories";
-import { I18N_SERVICE_PROVIDER } from "../i18n";
 
 // Storybook starts here
 export default {
diff --git a/src/pagination/pagination-nav/pagination-nav.component.spec.ts b/src/pagination/pagination-nav/pagination-nav.component.spec.ts
@@ -1,7 +1,6 @@
 import { TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { Component, type OnInit } from "@angular/core";
-import { I18N_SERVICE_PROVIDER } from "../../i18n";
 import { PaginationNav } from "./index";
 import { PaginationModel } from "../pagination-model.class";
 
@@ -17,8 +16,7 @@ import { PaginationModel } from "../pagination-model.class";
 	standalone: true,
 	imports: [
 		PaginationNav
-	],
-	providers: [I18N_SERVICE_PROVIDER]
+	]
 })
 class PaginationNavTest implements OnInit {
 	model = new PaginationModel();
diff --git a/src/pagination/pagination-nav/pagination-nav.component.ts b/src/pagination/pagination-nav/pagination-nav.component.ts
@@ -7,7 +7,7 @@ import {
 	HostBinding
 } from "@angular/core";
 
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { ExperimentalService, EXPERIMENTAL_SERVICE_PROVIDER } from "carbon-components-angular/experimental";
 import { merge } from "carbon-components-angular/utils";
 import { range } from "carbon-components-angular/common";
@@ -129,7 +129,7 @@ export interface PaginationNavTranslations {
 		PaginationOverflow,
 		AsyncPipe
 	],
-	providers: [I18N_SERVICE_PROVIDER, EXPERIMENTAL_SERVICE_PROVIDER]
+	providers: [EXPERIMENTAL_SERVICE_PROVIDER]
 })
 export class PaginationNav {
 	static paginationCounter = 0;
diff --git a/src/pagination/pagination.component.ts b/src/pagination/pagination.component.ts
@@ -6,7 +6,7 @@ import {
 	EventEmitter
 } from "@angular/core";
 
-import { I18N_SERVICE_PROVIDER, I18n, ReplacePipe } from "carbon-components-angular/i18n";
+import { I18n, ReplacePipe } from "carbon-components-angular/i18n";
 import { ExperimentalService, EXPERIMENTAL_SERVICE_PROVIDER } from "carbon-components-angular/experimental";
 import { merge } from "carbon-components-angular/utils";
 import { range } from "carbon-components-angular/common";
@@ -218,7 +218,7 @@ export interface PaginationTranslations {
 	`,
 	standalone: true,
 	imports: [NgClass, FormsModule, IconDirective, NgStyle, Button, AsyncPipe, ReplacePipe],
-	providers: [I18N_SERVICE_PROVIDER, EXPERIMENTAL_SERVICE_PROVIDER]
+	providers: [EXPERIMENTAL_SERVICE_PROVIDER]
 })
 export class Pagination {
 	static paginationCounter = 0;
diff --git a/src/search/search.component.ts b/src/search/search.component.ts
@@ -11,7 +11,7 @@ import {
 	ViewChild
 } from "@angular/core";
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { NgClass } from "@angular/common";
 import { IconDirective } from "carbon-components-angular/icon";
 
@@ -32,8 +32,7 @@ import { IconDirective } from "carbon-components-angular/icon";
 			provide: NG_VALUE_ACCESSOR,
 			useExisting: Search,
 			multi: true
-		},
-		I18N_SERVICE_PROVIDER
+		}
 	],
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
diff --git a/src/tabs/tab-headers.component.ts b/src/tabs/tab-headers.component.ts
@@ -17,7 +17,7 @@ import {
 	EventEmitter
 } from "@angular/core";
 import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 
 import { BaseTabHeader } from "./base-tab-header.component";
 import { Tab } from "./tab.component";
@@ -114,7 +114,7 @@ import { NgClass, NgTemplateOutlet } from "@angular/common";
 		</button>
 	`,
 	standalone: true,
-	providers: [EventService, DOCUMENT_SERVICE_PROVIDER, I18N_SERVICE_PROVIDER],
+	providers: [EventService, DOCUMENT_SERVICE_PROVIDER],
 	imports: [NgClass, NgTemplateOutlet]
 })
 
diff --git a/src/ui-shell/header/header.component.ts b/src/ui-shell/header/header.component.ts
@@ -8,7 +8,7 @@ import {
 } from "@angular/core";
 import { DomSanitizer } from "@angular/platform-browser";
 import { Router, RouterLink } from "@angular/router";
-import { I18N_SERVICE_PROVIDER, I18n } from "carbon-components-angular/i18n";
+import { I18n } from "carbon-components-angular/i18n";
 import { NgTemplateOutlet, AsyncPipe } from "@angular/common";
 
 /**
@@ -58,7 +58,7 @@ import { NgTemplateOutlet, AsyncPipe } from "@angular/common";
 	`,
 	standalone: true,
 	imports: [NgTemplateOutlet, RouterLink, AsyncPipe],
-	providers: [I18N_SERVICE_PROVIDER, Router]
+	providers: [Router]
 })
 export class Header {
 	/**
