nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue 88: When no timezone is set, Plinth shows first one in list.

Browse Source
This commit is contained in:
Bharath Chava 2015-07-20 15:15:00 +00:00 committed by Sunil Mohan Adapa
parent d650273760
commit d93fbba51f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plinth/modules/config/config.py
View File

@ -89,8 +89,12 @@ separated by dots.'),
# pylint: disable-msg=E1101, W0233 # pylint: disable-msg=E1101, W0233
forms.Form.__init__(self, *args, **kwargs) forms.Form.__init__(self, *args, **kwargs)
self.fields['time_zone'].choices = [(zone, zone) timezone_options = [(zone, zone)
for zone in self.get_time_zones()] for zone in self.get_time_zones()]
timezone_options.append(('none', _('No timezone set')))
self.fields['time_zone'].choices = timezone_options
@staticmethod @staticmethod
def get_time_zones(): def get_time_zones():
@ -141,7 +145,16 @@ def get_status():
"""Return the current status""" """Return the current status"""
return {'hostname': get_hostname(), return {'hostname': get_hostname(),
'domainname': get_domainname(), 'domainname': get_domainname(),
'time_zone': open('/etc/timezone').read().rstrip()} 'time_zone': get_current_timezone()}
def get_current_timezone():
"""Get current timezone"""
timezone = open('/etc/timezone').read().rstrip()
if timezone != '':
return timezone
return 'none'
def _apply_changes(request, old_status, new_status): def _apply_changes(request, old_status, new_status):
@ -168,7 +181,8 @@ def _apply_changes(request, old_status, new_status):
else: else:
messages.info(request, _('Domain name is unchanged')) messages.info(request, _('Domain name is unchanged'))
if old_status['time_zone'] != new_status['time_zone']: if old_status['time_zone'] != new_status['time_zone'] and \
new_status['time_zone'] != 'none':
try: try:
actions.superuser_run('timezone-change', [new_status['time_zone']]) actions.superuser_run('timezone-change', [new_status['time_zone']])
except Exception as exception: except Exception as exception: