Daniel Brötzmann pushed to branch master at gajim / gajim

Commits: eeb456b4 by wurstsalat at 2022-12-12T19:31:06+01:00 imprv: Timestamps: Use date/time format preference in more places

Fixes #10948

- - - - -

7 changed files:

- gajim/gtk/app_page.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py - gajim/gtk/search_view.py - gajim/gtk/tooltips.py

Changes:

===================================== gajim/gtk/app_page.py ===================================== @@ -24,7 +24,6 @@ from gi.repository import Gtk

from gajim.common import app -from gajim.common.helpers import from_one_line from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.plugins.pluginmanager import PluginManifest @@ -140,7 +139,7 @@ def _get_update_text() -> str: return _('No updates available (last check: never)')

date = datetime.strptime(last_check, '%Y-%m-%d %H:%M') - format_string = from_one_line(app.settings.get('date_format')) + format_string = app.settings.get('date_format') return _('No updates available (last check: %s)') % date.strftime( format_string)

===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -16,6 +16,8 @@

from gi.repository import Gtk

+from gajim.common import app + from .base import BaseRow

@@ -30,7 +32,8 @@ def __init__(self, account: str, timestamp: datetime) -> None: self.timestamp = timestamp self.get_style_context().add_class('conversation-date-row')

- self.label.set_text(timestamp.strftime('%a, %d %b %Y')) + format_string = app.settings.get('date_format') + self.label.set_text(timestamp.strftime('%a ' + format_string)) self.label.set_halign(Gtk.Align.CENTER) self.label.set_hexpand(True) self.label.get_style_context().add_class('conversation-meta')

===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -93,19 +93,18 @@ class DateTimeLabel(Gtk.Label): def __init__(self, timestamp: datetime) -> None: Gtk.Label.__init__(self)

- time_format = app.settings.get('time_format') + format_string = app.settings.get('time_format') if timestamp.date() < datetime.today().date(): - date_format = app.settings.get('date_format') - time_format = f'{time_format} - {date_format}' - timestamp_formatted = timestamp.strftime(time_format) + format_string = app.settings.get('date_time_format')

- self.set_text(timestamp_formatted) + self.set_text(timestamp.strftime(format_string)) self.set_halign(Gtk.Align.START) self.set_valign(Gtk.Align.END) self.set_margin_start(6) self.set_margin_end(3) self.get_style_context().add_class('conversation-meta') - self.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %X')) + format_string = app.settings.get('date_time_format') + self.set_tooltip_text(timestamp.strftime(format_string))

class NicknameLabel(Gtk.Label):

===================================== gajim/gtk/conversation/view.py ===================================== @@ -42,7 +42,6 @@ from gajim.common import types from gajim.common import events from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import from_one_line from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day from gajim.common.modules.contacts import GroupchatContact @@ -144,11 +143,11 @@ def __init__(self) -> None: 'activate', self._on_scroll_view)

def copy_selected_messages(self) -> None: - time_format = from_one_line(app.settings.get('date_time_format')) + format_string = app.settings.get('date_time_format') selection_text = '' for row in cast(list[BaseRow], self._list_box.get_selected_rows()): if isinstance(row, MessageRow): - timestamp_formatted = row.timestamp.strftime(time_format) + timestamp_formatted = row.timestamp.strftime(format_string) selection_text += (f'{timestamp_formatted} - {row.name}: ' f'{row.get_text()}\n')

===================================== gajim/gtk/menus.py ===================================== @@ -35,7 +35,6 @@ from gajim.common import app from gajim.common import types from gajim.common.helpers import filesystem_path_from_uri -from gajim.common.helpers import from_one_line from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_retraction_allowed from gajim.common.helpers import is_role_change_allowed @@ -665,8 +664,8 @@ def get_chat_row_menu(contact: types.ChatContactT,

text = text.replace('"', '\"')

- time_format = from_one_line(app.settings.get('time_format')) - timestamp_formatted = timestamp.strftime(time_format) + format_string = app.settings.get('date_time_format') + timestamp_formatted = timestamp.strftime(format_string) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( (p_('Message row action', 'Copy'),

===================================== gajim/gtk/search_view.py ===================================== @@ -434,7 +434,8 @@ def __init__(self, msg: SearchLogRow, account: str, jid: JID) -> None: self._ui.row_avatar.set_from_surface(avatar)

local_time = time.localtime(msg.time) - date = time.strftime('%H:%M', local_time) + format_string = app.settings.get('time_format') + date = time.strftime(format_string, local_time) self._ui.row_time_label.set_label(date)

message_widget = MessageWidget(account, selectable=False)

===================================== gajim/gtk/tooltips.py ===================================== @@ -236,9 +236,11 @@ def _add_resources(self, contact: types.BareContact) -> None: idle_time = datetime(*(idle_time[:6])) current = datetime.now() if idle_time.date() == current.date(): - formatted = idle_time.strftime('%X') + format_string = app.settings.get('time_format') + formatted = idle_time.strftime(format_string) else: - formatted = idle_time.strftime('%c') + format_string = app.settings.get('date_time_format') + formatted = idle_time.strftime(format_string) idle_text = _('Idle since: %s') % formatted idle_label = Gtk.Label(label=idle_text) idle_label.set_halign(Gtk.Align.START)

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eeb456b4f5354937986d7cc586aef73f5...