diff --git a/lib/ui/account/sessions_page.dart b/lib/ui/account/sessions_page.dart index 820bc8f44..b34fca071 100644 --- a/lib/ui/account/sessions_page.dart +++ b/lib/ui/account/sessions_page.dart @@ -6,7 +6,7 @@ import "package:photos/generated/l10n.dart"; import 'package:photos/models/sessions.dart'; import 'package:photos/services/user_service.dart'; import 'package:photos/ui/common/loading_widget.dart'; -import 'package:photos/utils/date_time_util.dart'; +import "package:photos/utils/date_time_util.dart"; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/toast_util.dart'; @@ -90,7 +90,7 @@ class _SessionsPageState extends State { const Padding(padding: EdgeInsets.all(8)), Flexible( child: Text( - getFormattedTime(lastUsedTime), + getFormattedTime(context, lastUsedTime), style: TextStyle( color: Theme.of(context) .colorScheme diff --git a/lib/ui/sharing/manage_links_widget.dart b/lib/ui/sharing/manage_links_widget.dart index 4f147c0fa..73c3d0818 100644 --- a/lib/ui/sharing/manage_links_widget.dart +++ b/lib/ui/sharing/manage_links_widget.dart @@ -116,6 +116,7 @@ class _ManageSharedLinkWidgetState extends State { ? S.of(context).expiredLinkInfo : S.of(context).linkExpiresOn( getFormattedTime( + context, DateTime.fromMicrosecondsSinceEpoch( url.validTill, ), diff --git a/lib/utils/date_time_util.dart b/lib/utils/date_time_util.dart index 758418b77..695df6468 100644 --- a/lib/utils/date_time_util.dart +++ b/lib/utils/date_time_util.dart @@ -1,3 +1,4 @@ +import "package:flutter/cupertino.dart"; import 'package:flutter/foundation.dart'; import 'package:intl/intl.dart'; @@ -119,16 +120,13 @@ String getTimeIn12hrFormat(DateTime dateTime) { } //Thu, Jun 30, 2022 - 14:32 -String getFormattedTime(DateTime dateTime) { - return getDay(dateTime) + - ", " + - getMonth(dateTime) + - " " + - dateTime.day.toString() + - ", " + - dateTime.year.toString() + - " - " + - getTime(dateTime); +String getFormattedTime(BuildContext context, DateTime dateTime) { + return DateFormat( + 'E, MMM d, y - HH:mm', + Localizations.localeOf(context).languageCode, + ).format( + dateTime, + ); } String daysLeft(int futureTime) {