diff --git a/briar-gtk/briar_gtk/widgets/private_message.py b/briar-gtk/briar_gtk/widgets/private_message.py index 72d3749bd6b41e2369c50787bfd6ce3ccb7595cd..c434c95723345b7f2ccf2a0cec3a3d8e50f4433a 100644 --- a/briar-gtk/briar_gtk/widgets/private_message.py +++ b/briar-gtk/briar_gtk/widgets/private_message.py @@ -5,7 +5,7 @@ # Initial version based on GNOME Fractal # https://gitlab.gnome.org/GNOME/fractal/-/tags/4.2.2 -import datetime +from datetime import datetime from gettext import gettext as _ from gi.repository import Gtk @@ -55,15 +55,23 @@ class PrivateMessageWidget(Gtk.ListBoxRow): return username_event_box @staticmethod - def _create_date_info(time): - date_label = Gtk.Label.new( - datetime.datetime.fromtimestamp(time).strftime("%I:%M")) + def _create_date_info(timestamp): + time = PrivateMessageWidget._make_timestamp_readable(timestamp) + date_label = Gtk.Label.new(time) date_label.set_justify(Gtk.Justification.RIGHT) date_label.set_valign(Gtk.Align.START) date_label.set_halign(Gtk.Align.END) date_label.get_style_context().add_class("timestamp") return date_label + @staticmethod + def _make_timestamp_readable(timestamp): + time = datetime.fromtimestamp(timestamp) + current_time = datetime.today() + if time.date() == current_time.date(): + return time.strftime("%I:%M") + return time.strftime("%x %I:%M") + @staticmethod def _create_info(username_info, date_info): info = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, 0)