Merge pull request #34759 from dimagi/es/fix-timezone

Fix get_timezone call on exports download page

corehq/apps/export/views/download.py

@@ -59,7 +59,6 @@
 from corehq.apps.export.utils import get_export
 from corehq.apps.export.views.utils import (
     ExportsPermissionsManager,
-    get_timezone,
     case_type_or_app_limit_exceeded
 )
 from corehq.apps.hqwebapp.decorators import use_daterangepicker
@@ -74,6 +73,7 @@
 from corehq.apps.settings.views import BaseProjectDataView
 from corehq.apps.users.models import CouchUser
 from corehq.toggles import PAGINATED_EXPORTS
+from corehq.util.timezones.utils import get_timezone
 from corehq.util.view_utils import is_ajax
 from corehq.toggles import EXPORT_DATA_SOURCE_DATA
 from corehq.apps.userreports.models import DataSourceConfiguration
@@ -115,7 +115,7 @@ def send_preparation_analytics(self, export_instances, export_filters):
 
     def get_filter_form(self, filter_form_data):
         domain_object = Domain.get_by_name(self.domain)
-        timezone = get_timezone(self.domain, self.request.couch_user)
+        timezone = get_timezone(self.request, self.domain)
         filter_form = self.filter_form_class(domain_object, timezone, filter_form_data)
 
         if not filter_form.is_valid():
@@ -179,7 +179,7 @@ def view_helper(self):
     @property
     @memoized
     def timezone(self):
-        return get_timezone(self.domain, self.request.couch_user)
+        return get_timezone(self.request, self.domain)
 
     @property
     @memoized