# HG changeset patch # User Marcin Kuzminski # Date 2017-01-12 17:26:34 # Node ID 8c3404aad27524b28f15cb2a6c7777d01142a30e # Parent b929e98f75980ad24903322c838df6a9138a8d7d system-info: fix unicode problem on translation diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py --- a/rhodecode/lib/system_info.py +++ b/rhodecode/lib/system_info.py @@ -134,7 +134,8 @@ def uptime(): human_value = value.copy() human_value['boot_time'] = time_to_datetime(boot_time) human_value['uptime'] = age(time_to_datetime(boot_time), show_suffix=False) - human_value['text'] = 'Server started {}'.format( + + human_value['text'] = u'Server started {}'.format( age(time_to_datetime(boot_time))) return SysInfoRes(value=value, human_value=human_value) diff --git a/rhodecode/subscribers.py b/rhodecode/subscribers.py --- a/rhodecode/subscribers.py +++ b/rhodecode/subscribers.py @@ -30,7 +30,6 @@ from threading import Thread from rhodecode.translation import _ as tsf - log = logging.getLogger(__name__) @@ -69,6 +68,7 @@ def set_user_lang(event): if cur_user: user_lang = cur_user.get_instance().user_data.get('language') if user_lang: + log.debug('lang: setting current user:%s language to: %s', cur_user, user_lang) event.request._LOCALE_ = user_lang