diff --git a/app/main/forms.py b/app/main/forms.py index 606b20073..c3ac4d6a3 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -76,7 +76,7 @@ from app.utils.user_permissions import all_ui_permissions, permission_options def get_time_value_and_label(future_time): return ( future_time.replace(tzinfo=None).isoformat(), - '{} at {}'.format( + '{} at {} ET'.format( get_human_day(future_time.astimezone(pytz.timezone(current_app.config['TIMEZONE']))), get_human_time(future_time.astimezone(pytz.timezone(current_app.config['TIMEZONE']))) ) diff --git a/tests/app/main/forms/test_choose_time_form.py b/tests/app/main/forms/test_choose_time_form.py index 80ebcc318..e419f54c7 100644 --- a/tests/app/main/forms/test_choose_time_form.py +++ b/tests/app/main/forms/test_choose_time_form.py @@ -11,19 +11,19 @@ def test_form_contains_next_24h(notify_admin): # Friday assert choices[0] == ('', 'Now') - assert choices[1] == ('2016-01-01T17:00:00', 'Today at noon') - assert choices[13] == ('2016-01-02T05:00:00', 'Today at midnight') + assert choices[1] == ('2016-01-01T17:00:00', 'Today at noon ET') + assert choices[13] == ('2016-01-02T05:00:00', 'Today at midnight ET') # Saturday - assert choices[14] == ('2016-01-02T06:00:00', 'Tomorrow at 1am') - assert choices[37] == ('2016-01-03T05:00:00', 'Tomorrow at midnight') + assert choices[14] == ('2016-01-02T06:00:00', 'Tomorrow at 1am ET') + assert choices[37] == ('2016-01-03T05:00:00', 'Tomorrow at midnight ET') # Sunday - assert choices[38] == ('2016-01-03T06:00:00', 'Sunday at 1am') + assert choices[38] == ('2016-01-03T06:00:00', 'Sunday at 1am ET') # Monday - assert choices[62] == ('2016-01-04T06:00:00', 'Monday at 1am') - assert choices[80] == ('2016-01-05T00:00:00', 'Monday at 7pm') + assert choices[62] == ('2016-01-04T06:00:00', 'Monday at 1am ET') + assert choices[80] == ('2016-01-05T00:00:00', 'Monday at 7pm ET') # assert choices[84] == ('2016-01-05T04:00:00', 'Monday at 11pm') # assert choices[85] == ('2016-01-05T05:00:00', 'Monday at midnight')