diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts
index 157f9f49e2..7890e65b36 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts
@@ -37,6 +37,7 @@ import { selfFactory } from '../../utils/factory.util';
#timepicker
[formControlName]="prop.name"
(ngModelChange)="setDate($event)"
+ [meridian]="meridian"
>
`,
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -58,6 +59,7 @@ import { selfFactory } from '../../utils/factory.util';
})
export class DateTimePickerComponent {
@Input() prop: FormProp;
+ @Input() meridian = false;
@ViewChild(NgbInputDatepicker) date: NgbInputDatepicker;
@ViewChild(NgbTimepicker) time: NgbTimepicker;
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
index f3f60a56dc..c3fdbdff07 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
@@ -110,7 +110,7 @@
-
+
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
index 893d6e6344..238eb8d066 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
@@ -1,4 +1,4 @@
-import { ABP, AbpValidators, TrackByService } from '@abp/ng.core';
+import { ABP, AbpValidators, ConfigStateService, TrackByService } from '@abp/ng.core';
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
@@ -82,6 +82,12 @@ export class ExtensibleFormPropComponent implements OnChanges {
typeaheadFormatter = (option: ABP.Option) => option.key;
+ get meridian() {
+ return (
+ this.configState.getDeep('localization.currentCulture.dateTimeFormat.shortTimePattern') || ''
+ ).includes('tt');
+ }
+
get isInvalid() {
const control = this.form.get(this.prop.name);
return control.touched && control.invalid;
@@ -90,6 +96,7 @@ export class ExtensibleFormPropComponent implements OnChanges {
constructor(
public readonly cdRef: ChangeDetectorRef,
public readonly track: TrackByService,
+ protected configState: ConfigStateService,
groupDirective: FormGroupDirective,
) {
this.form = groupDirective.form;