GitLab

at 2020-01-25T19:59:41+01:00

ConversationsTextview: Remove fuzzy timestamps

- Change default timestamp to include date

closes #9272

         'history_window_x-position': [opt_int, 0],

         'history_window_y-position': [opt_int, 0],

         'latest_disco_addresses': [opt_str, ''],

-        'time_stamp': [opt_str, '[%X] ', _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html).')],

+        'time_stamp': [opt_str, '%x | %X  ', _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).')],

         'before_nickname': [opt_str, '', _('Characters that are printed before the nickname in conversations.')],

         'after_nickname': [opt_str, ':', _('Characters that are printed after the nickname in conversations.')],

         'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')],

             self.update_config_to_016105()

         if old < [0, 98, 3] and new >= [0, 98, 3]:

             self.update_config_to_0983()

+        if old < [1, 1, 93] and new >= [1, 1, 93]:

+            self.update_config_to_1193()

 

         app.config.set('version', new_version)

 

             elif password == "libsecret:":

                 app.config.set_per('accounts', account, 'password', '')

         app.config.set('version', '0.98.3')

+

+    def update_config_to_1193(self):

+        # add date to time_stamp, if user did not set a custom time_stamp

+        if self.old_values['time_stamp'] == '[%X] ':

+            app.config.set('time_stamp', '%x | %X  ')

+        app.config.set('version', '1.1.93')
 # along with Gajim. If not, see <http://www.gnu.org/licenses/>.

 

 import time

-import os

 import queue

 import urllib

 import logging

-from calendar import timegm

 

 from gi.repository import Gtk

 from gi.repository import Pango

 

         self.line += 1

 

-    def get_time_to_show(self, tim, direction_mark=''):

+    def get_time_to_show(self, tim):

         """

-        Get the time, with the day before if needed and return it. It DOESN'T

-        format a fuzzy time

+        Format the time according to config setting 'time_stamp'

         """

-        format_ = ''

-        # get difference in days since epoch (86400 = 24*3600)

-        # number of days since epoch for current time (in GMT) -

-        # number of days since epoch for message (in GMT)

-        diff_day = int(int(timegm(time.localtime())) / 86400 -\

-                int(timegm(tim)) / 86400)

-        if diff_day == 0.0:

-            day_str = ''

-        else:

-            #%i is day in year (1-365)

-            day_str = i18n.ngettext('Yesterday',

-                '%(nb_days)i days ago', diff_day, {'nb_days': diff_day},

-                {'nb_days': diff_day})

-        if day_str:

-            # strftime Windows bug has problems with Unicode

-            # see: http://bugs.python.org/issue8304

-            if os.name != 'nt':

-                format_ += i18n.direction_mark + day_str + direction_mark + ' '

-            else:

-                format_ += day_str + ' '

-        timestamp_str = app.config.get('time_stamp')

-        timestamp_str = helpers.from_one_line(timestamp_str)

-        format_ += timestamp_str

+        format_ = helpers.from_one_line(app.config.get('time_stamp'))

         tim_format = time.strftime(format_, tim)

         return tim_format

 

         current_print_time = app.config.get('print_time')

 

         if current_print_time == 'always':

-            timestamp_str = self.get_time_to_show(local_tim, direction_mark)

+            timestamp_str = self.get_time_to_show(local_tim)

             timestamp = time.strftime(timestamp_str, local_tim)

             timestamp = direction_mark + timestamp + direction_mark

             if other_tags_for_time:

             seconds_passed = tim - self.last_time_printout

             if seconds_passed > every_foo_seconds:

                 self.last_time_printout = tim

-                tim_format = self.get_time_to_show(local_tim, direction_mark)

+                tim_format = self.get_time_to_show(local_tim)

                 buffer_.insert_with_tags_by_name(iter_, tim_format + '\n',

                     'time_sometimes')

 

             self.nickname_col_for_logs.set_visible(False)

             self.subject_col_for_logs.set_visible(True)

 

+        format_ = helpers.from_one_line(app.config.get('time_stamp'))

         for row in results:

             # exposed in UI (TreeViewColumns) are only

             # time, message, subject, nickname

             log_line_id, jid_id, time_, kind, message, subject, nickname, \

                 show = row

             try:

-                time_ = time.strftime('%x', time.localtime(float(time_)))

+                time_ = time.strftime(format_, time.localtime(float(time_)))

             except ValueError:

                 pass

             else:

                 ''', (like_sql, like_sql))

 

         results = self.cur.fetchall()

+        format_ = helpers.from_one_line(app.config.get('time_stamp'))

         for row in results:

             # exposed in UI (TreeViewColumns) are only

             # JID, time, message, subject, nickname

             # log_line_id, jid (from jid_id), time, message, subject, nickname

             log_line_id, jid_id, time_, message, subject, nickname = row

             try:

-                time_ = time.strftime('%x', time.localtime(float(time_)))

+                time_ = time.strftime(format_, time.localtime(float(time_)))

             except ValueError:

                 pass

             else:

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

4 changed files:

Changes: