From e02a88e64d6fd74239e40751b6df0a55754268b0 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 12 Jan 2017 18:26:34 +0100 Subject: [PATCH] system-info: fix unicode problem on translation --- rhodecode/lib/system_info.py | 3 ++- rhodecode/subscribers.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py index 20fb716b..9cbf20d9 100644 --- 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 index cb2c6bce..52e949a8 100644 --- 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