From 645de4508ed93e03d47e1a2f40b47adcd7f7aaab Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 4 Apr 2024 11:59:33 +0700 Subject: [PATCH] TF-2773 Fix printing no year on the email date --- core/lib/domain/extensions/datetime_extension.dart | 10 ++++++++++ .../datasource_impl/print_file_datasource_impl.dart | 2 +- model/lib/extensions/email_extension.dart | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/lib/domain/extensions/datetime_extension.dart b/core/lib/domain/extensions/datetime_extension.dart index 2af95ffd5..4befa02ca 100644 --- a/core/lib/domain/extensions/datetime_extension.dart +++ b/core/lib/domain/extensions/datetime_extension.dart @@ -1,4 +1,6 @@ +import 'dart:ui'; + extension DateTimeExtension on DateTime { bool isToday() { @@ -54,4 +56,12 @@ extension DateTimeNullableExtension on DateTime? { return 'dd.MM.yyyy, HH:mm'; } } + + String toPatternForPrinting(String locale) { + if (locale == const Locale('en', 'US').toLanguageTag()) { + return 'MMM dd y, HH:mm'; + } else { + return 'dd MMM y, HH:mm'; + } + } } diff --git a/lib/features/email/data/datasource_impl/print_file_datasource_impl.dart b/lib/features/email/data/datasource_impl/print_file_datasource_impl.dart index 1ba19531b..572f4ffb8 100644 --- a/lib/features/email/data/datasource_impl/print_file_datasource_impl.dart +++ b/lib/features/email/data/datasource_impl/print_file_datasource_impl.dart @@ -33,7 +33,7 @@ class PrintFileDataSourceImpl extends PrintFileDataSource { : null; final receiveTime = emailPrint.emailInformation.getReceivedAt( newLocale: emailPrint.locale, - pattern: emailPrint.emailInformation.receivedAt?.value.toLocal().toPatternForEmailView() + pattern: emailPrint.emailInformation.receivedAt?.value.toLocal().toPatternForPrinting(emailPrint.locale) ); final List listPrintAttachment = []; diff --git a/model/lib/extensions/email_extension.dart b/model/lib/extensions/email_extension.dart index f53f45cff..a7738ebc3 100644 --- a/model/lib/extensions/email_extension.dart +++ b/model/lib/extensions/email_extension.dart @@ -46,7 +46,6 @@ extension EmailExtension on Email { } String getReceivedAt({required String newLocale, String? pattern}) { - log('EmailExtension::getReceivedAt: newLocale = $newLocale | pattern = $pattern'); if (receivedAt != null) { return receivedAt!.formatDateToLocal( pattern: pattern ?? receivedAt!.value.toLocal().toPattern(),