Browse Source

fix(admin-ui): Use correct 24hr format for locale in dates (#2972)

Fixes #2970
William Rijksen 1 year ago
parent
commit
f078b4193b

+ 2 - 2
packages/admin-ui/src/lib/core/src/shared/pipes/locale-date.pipe.spec.ts

@@ -23,11 +23,11 @@ describe('LocaleDatePipe', () => {
 
 
     it('medium format German', () => {
     it('medium format German', () => {
         const pipe = new LocaleDatePipe();
         const pipe = new LocaleDatePipe();
-        expect(pipe.transform(testDate, 'medium', LanguageCode.de)).toBe('12. Jan. 2021, 9:12:42 AM');
+        expect(pipe.transform(testDate, 'medium', LanguageCode.de)).toBe('12. Jan. 2021, 09:12:42');
     });
     });
 
 
     it('medium format Chinese', () => {
     it('medium format Chinese', () => {
         const pipe = new LocaleDatePipe();
         const pipe = new LocaleDatePipe();
-        expect(pipe.transform(testDate, 'medium', LanguageCode.zh)).toBe('2021年1月12日 上午9:12:42');
+        expect(pipe.transform(testDate, 'medium', LanguageCode.zh)).toBe('2021年1月12日 09:12:42');
     });
     });
 });
 });

+ 0 - 3
packages/admin-ui/src/lib/core/src/shared/pipes/locale-date.pipe.ts

@@ -47,14 +47,12 @@ export class LocaleDatePipe extends LocaleBasePipe implements PipeTransform {
                     hour: 'numeric',
                     hour: 'numeric',
                     minute: 'numeric',
                     minute: 'numeric',
                     second: 'numeric',
                     second: 'numeric',
-                    hour12: true,
                 };
                 };
             case 'mediumTime':
             case 'mediumTime':
                 return {
                 return {
                     hour: 'numeric',
                     hour: 'numeric',
                     minute: 'numeric',
                     minute: 'numeric',
                     second: 'numeric',
                     second: 'numeric',
-                    hour12: true,
                 };
                 };
             case 'longDate':
             case 'longDate':
                 return {
                 return {
@@ -75,7 +73,6 @@ export class LocaleDatePipe extends LocaleBasePipe implements PipeTransform {
                     year: '2-digit',
                     year: '2-digit',
                     hour: 'numeric',
                     hour: 'numeric',
                     minute: 'numeric',
                     minute: 'numeric',
-                    hour12: true,
                 };
                 };
             default:
             default:
                 return;
                 return;