diff --git a/openstack_dashboard/dashboards/settings/user/forms.py b/openstack_dashboard/dashboards/settings/user/forms.py index e0cd19f3a..059f89408 100644 --- a/openstack_dashboard/dashboards/settings/user/forms.py +++ b/openstack_dashboard/dashboards/settings/user/forms.py @@ -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: diff --git a/openstack_dashboard/dashboards/settings/user/tests.py b/openstack_dashboard/dashboards/settings/user/tests.py index 4535d6f30..8f38ae556 100644 --- a/openstack_dashboard/dashboards/settings/user/tests.py +++ b/openstack_dashboard/dashboards/settings/user/tests.py @@ -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)")