Merge "Timezones can change - display the current tz offset"
This commit is contained in:
commit
a8dca2f03f
@ -39,7 +39,7 @@ class UserSettingsForm(forms.SelfHandlingForm):
|
||||
self.fields['language'].choices = languages
|
||||
|
||||
# Timezones
|
||||
d = datetime(2011, 1, 1)
|
||||
d = datetime(datetime.today().year, 1, 1)
|
||||
timezones = []
|
||||
for tz in pytz.common_timezones:
|
||||
try:
|
||||
|
@ -29,3 +29,4 @@ class UserSettingsTest(test.TestCase):
|
||||
|
||||
self.assertContains(res, "Australia/Melbourne (UTC +11:00)")
|
||||
self.assertContains(res, "Canada/Newfoundland (UTC -03:30)")
|
||||
self.assertContains(res, "Europe/Moscow (UTC +04:00)")
|
||||
|
Loading…
x
Reference in New Issue
Block a user