engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

system-info: fix unicode problem on translation

Browse source
This commit is contained in:
Marcin Kuzminski 2017-01-12 18:26:34 +01:00
parent 526cdfd9b2
commit e02a88e64d
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/lib/system_info.py
View file

@ -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)

2
rhodecode/subscribers.py
View file

@ -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