Show More
@@ -134,7 +134,8 b' def uptime():' | |||||
134 | human_value = value.copy() |
|
134 | human_value = value.copy() | |
135 | human_value['boot_time'] = time_to_datetime(boot_time) |
|
135 | human_value['boot_time'] = time_to_datetime(boot_time) | |
136 | human_value['uptime'] = age(time_to_datetime(boot_time), show_suffix=False) |
|
136 | human_value['uptime'] = age(time_to_datetime(boot_time), show_suffix=False) | |
137 | human_value['text'] = 'Server started {}'.format( |
|
137 | ||
|
138 | human_value['text'] = u'Server started {}'.format( | |||
138 | age(time_to_datetime(boot_time))) |
|
139 | age(time_to_datetime(boot_time))) | |
139 |
|
140 | |||
140 | return SysInfoRes(value=value, human_value=human_value) |
|
141 | return SysInfoRes(value=value, human_value=human_value) |
@@ -30,7 +30,6 b' from threading import Thread' | |||||
30 |
|
30 | |||
31 | from rhodecode.translation import _ as tsf |
|
31 | from rhodecode.translation import _ as tsf | |
32 |
|
32 | |||
33 |
|
||||
34 | log = logging.getLogger(__name__) |
|
33 | log = logging.getLogger(__name__) | |
35 |
|
34 | |||
36 |
|
35 | |||
@@ -69,6 +68,7 b' def set_user_lang(event):' | |||||
69 | if cur_user: |
|
68 | if cur_user: | |
70 | user_lang = cur_user.get_instance().user_data.get('language') |
|
69 | user_lang = cur_user.get_instance().user_data.get('language') | |
71 | if user_lang: |
|
70 | if user_lang: | |
|
71 | log.debug('lang: setting current user:%s language to: %s', cur_user, user_lang) | |||
72 | event.request._LOCALE_ = user_lang |
|
72 | event.request._LOCALE_ = user_lang | |
73 |
|
73 | |||
74 |
|
74 |
General Comments 0
You need to be logged in to leave comments.
Login now