Merge 1f30ab3 into 656ed0f

akveo · Apr 20, 2021 · f17efc2 · f17efc2
2 parents 656ed0f + 1f30ab3
commit f17efc2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/src/framework/theme/components/datepicker/date-timepicker.component.ts b/src/framework/theme/components/datepicker/date-timepicker.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   ComponentFactoryResolver,
   Inject,
+  Injector,
   Input,
   OnInit,
   Optional,
@@ -88,10 +89,11 @@ export class NbDateTimePickerComponent<D> extends NbBasePickerComponent<D, D, Nb
               triggerStrategyBuilder: NbTriggerStrategyBuilderService,
               overlay: NbOverlayService,
               cfr: ComponentFactoryResolver,
+              injector: Injector,
               dateService: NbDateService<D>,
               @Optional() @Inject(NB_DATE_SERVICE_OPTIONS) dateServiceOptions,
               protected calendarWithTimeModelService: NbCalendarTimeModelService<D>) {
-    super(document, positionBuilder, triggerStrategyBuilder, overlay, cfr, dateService, dateServiceOptions);
+    super(document, positionBuilder, triggerStrategyBuilder, overlay, cfr, injector, dateService, dateServiceOptions);
   }
 
   ngOnInit() {

diff --git a/src/framework/theme/components/datepicker/datepicker.component.ts b/src/framework/theme/components/datepicker/datepicker.component.ts
@@ -20,6 +20,7 @@ import {
   OnInit,
   SimpleChanges,
   Optional,
+  Injector,
 } from '@angular/core';
 import { takeUntil } from 'rxjs/operators';
 import { Observable, ReplaySubject, Subject } from 'rxjs';
@@ -193,6 +194,7 @@ export abstract class NbBasePicker<D, T, P> extends NbDatepicker<T> {
                         protected positionBuilder: NbPositionBuilderService,
                         protected triggerStrategyBuilder: NbTriggerStrategyBuilderService,
                         protected cfr: ComponentFactoryResolver,
+                        protected injector: Injector,
                         protected dateService: NbDateService<D>,
                         protected dateServiceOptions,
   ) {
@@ -281,7 +283,9 @@ export abstract class NbBasePicker<D, T, P> extends NbDatepicker<T> {
   }
 
   protected openDatepicker() {
-    this.container = this.ref.attach(new NbComponentPortal(NbDatepickerContainerComponent, null, null, this.cfr));
+    this.container = this.ref.attach(
+      new NbComponentPortal(NbDatepickerContainerComponent, null, this.injector, this.cfr),
+    );
     this.instantiatePicker();
     this.subscribeOnValueChange();
     this.writeQueue();
@@ -471,10 +475,11 @@ export class NbBasePickerComponent<D, T, P> extends NbBasePicker<D, T, P>
               triggerStrategyBuilder: NbTriggerStrategyBuilderService,
               overlay: NbOverlayService,
               cfr: ComponentFactoryResolver,
+              injector: Injector,
               dateService: NbDateService<D>,
               @Optional() @Inject(NB_DATE_SERVICE_OPTIONS) dateServiceOptions,
   ) {
-    super(overlay, positionBuilder, triggerStrategyBuilder, cfr, dateService, dateServiceOptions);
+    super(overlay, positionBuilder, triggerStrategyBuilder, cfr, injector, dateService, dateServiceOptions);
   }
 
   ngOnInit() {

diff --git a/src/framework/theme/components/timepicker/model.ts b/src/framework/theme/components/timepicker/model.ts
@@ -8,6 +8,15 @@ import { InjectionToken } from '@angular/core';
 
 export const NB_TIME_PICKER_CONFIG = new InjectionToken('NB_TIME_PICKER_CONFIG');
 
+export const NB_TIME_PICKER_LOCALIZATION = new InjectionToken<NbTimepickerLocalization>('NB_TIME_PICKER_LOCALIZATION', {
+  providedIn: 'root',
+  factory: () => {
+    return {
+      hoursText: 'Hr', minutesText: 'Min', secondsText: 'Sec', ampmText: 'Am/Pm',
+    }
+  },
+});
+
 export interface NbTimePickerConfig {
   twelveHoursFormat?: boolean,
   format?: string,
@@ -21,3 +30,10 @@ export interface NbSelectedTimePayload<D> {
   time: D,
   save?: boolean,
 }
+
+export interface NbTimepickerLocalization {
+  hoursText: string,
+  minutesText: string,
+  secondsText: string,
+  ampmText: string,
+}
diff --git a/src/framework/theme/components/timepicker/timepicker.component.ts b/src/framework/theme/components/timepicker/timepicker.component.ts
@@ -6,7 +6,6 @@ import {
   EventEmitter,
   Inject,
   Input,
-  LOCALE_ID,
   OnChanges,
   OnInit,
   Output,
@@ -21,7 +20,13 @@ import { NbPlatform } from '../cdk/platform/platform-service';
 import { NbDateService, NbDayPeriod } from '../calendar-kit/services/date.service';
 import { range, rangeFromTo } from '../calendar-kit/helpers';
 import { NbCalendarTimeModelService } from '../calendar-kit/services/calendar-time-model.service';
-import { NB_TIME_PICKER_CONFIG, NbSelectedTimePayload, NbTimePickerConfig } from './model';
+import {
+  NB_TIME_PICKER_CONFIG,
+  NB_TIME_PICKER_LOCALIZATION,
+  NbSelectedTimePayload,
+  NbTimePickerConfig,
+  NbTimepickerLocalization,
+} from './model';
 
 interface NbTimePartOption {
   value: number,
@@ -146,10 +151,10 @@ export class NbTimePickerComponent<D> implements OnChanges, OnInit {
    */
   @Input() showFooter: boolean = true;
   @Input() applyButtonText: string;
-  @Input() hoursText = 'Hr';
-  @Input() minutesText = 'Min';
-  @Input() secondsText = 'Sec';
-  @Input() ampmText = 'Am/Pm';
+  @Input() hoursText = this.tokens.hoursText;
+  @Input() minutesText = this.tokens.minutesText;
+  @Input() secondsText = this.tokens.secondsText;
+  @Input() ampmText = this.tokens.ampmText;
   @Input() currentTimeButtonText: string;
 
   /**
@@ -159,8 +164,8 @@ export class NbTimePickerComponent<D> implements OnChanges, OnInit {
   @ViewChild(NbPortalDirective, {static: true}) portal: NbPortalDirective;
 
   constructor(@Inject(NB_TIME_PICKER_CONFIG) protected config: NbTimePickerConfig,
+              @Inject(NB_TIME_PICKER_LOCALIZATION) protected tokens: NbTimepickerLocalization,
               protected platformService: NbPlatform,
-              @Inject(LOCALE_ID) locale: string,
               public cd: ChangeDetectorRef,
               protected calendarTimeModelService: NbCalendarTimeModelService<D>,
               protected dateService: NbDateService<D>) {