diff --git a/app/response/utils.py b/app/response/utils.py index ed74e5204..1538d1571 100644 --- a/app/response/utils.py +++ b/app/response/utils.py @@ -2459,7 +2459,7 @@ def send_file_email(request_id, release_public_links, release_private_links, pri ).options( joinedload(Requests.agency) ).filter_by(id=request_id).one() - subject = 'Response Added to {} - File'.format(request_id) + subject = 'Response Added to {} - Record'.format(request_id) bcc = get_assigned_users_emails(request_id) if release_public_links or release_private_links: release_date = get_release_date(datetime.utcnow(), RELEASE_PUBLIC_DAYS, tz_name).strftime("%A, %B %d, %Y") @@ -2472,7 +2472,7 @@ def send_file_email(request_id, release_public_links, release_private_links, pri )) safely_send_and_add_email(request_id, email_content_requester, - 'Response Added to {} - File'.format(request_id), + 'Response Added to {} - Record'.format(request_id), to=[request.requester.email], bcc=bcc, reply_to=request.agency.default_email) @@ -2485,7 +2485,7 @@ def send_file_email(request_id, release_public_links, release_private_links, pri page=page) safely_send_and_add_email(request_id, email_content_agency, - 'File(s) Added to {}'.format(request_id), + 'Record(s) Added to {}'.format(request_id), bcc=bcc) elif private_links: email_content_agency = email_content.replace(replace_string, diff --git a/app/templates/email_templates/edit_response_file_links.html b/app/templates/email_templates/edit_response_file_links.html index e1c8d73e1..a39ac584b 100644 --- a/app/templates/email_templates/edit_response_file_links.html +++ b/app/templates/email_templates/edit_response_file_links.html @@ -1,6 +1,6 @@ {% if not agency and response_data.response.request.requester.is_anonymous_requester %}

- Link to file: + Link to record: {% if response_data.data_new['name'] %} {{ response_data.data_new['name'] }} {% else %} @@ -12,7 +12,7 @@ {% if agency or not response_data.response.request.requester.is_anonymous_requester %}

- Link to file: + Link to record: {% if response_data.data_new['name'] %} {{ response_data.data_new['name'] }} {% else %} diff --git a/app/templates/email_templates/email_edit_file.html b/app/templates/email_templates/email_edit_file.html index 68edc547c..69e2b29ba 100644 --- a/app/templates/email_templates/email_edit_file.html +++ b/app/templates/email_templates/email_edit_file.html @@ -4,20 +4,20 @@ {% if response_data.data_old['privacy'] != response_privacy.PRIVATE %}

- A file in request {{ request_id }} has been edited. + A record in request {{ request_id }} has been edited.

{% else %}

- A file in request {{ request_id }} is available for you to view. + A record in request {{ request_id }} is available for you to view.

{% if response_data.response.request.requester.is_anonymous_requester %}

- Link to file: + Link to record: {% if response_data.data_new['name'] %} {{ response_data.data_new['name'] }} {% else %} @@ -37,7 +37,7 @@ {% if response_data.data_old['name'] %}

- The file: + The record:

@@ -62,7 +62,7 @@ {% if response_data.data_old['name'] %}

- The file's name was changed from: + The record's name was changed from:

@@ -121,7 +121,7 @@ {% if not agency and response_data.response.request.requester.is_anonymous_requester %}

- Link to file: + Link to record: {% if response_data.data_new['name'] %} {{ response_data.data_new['name'] }} {% else %} @@ -135,7 +135,7 @@ {% if agency or not response_data.response.request.requester.is_anonymous_requester %}

- Link to file: + Link to record: {% if response_data.data_new['name'] %} {{ response_data.data_new['name'] }} {% else %} diff --git a/app/templates/email_templates/email_private_file_upload.html b/app/templates/email_templates/email_private_file_upload.html index 425c69445..5ead96ee9 100644 --- a/app/templates/email_templates/email_private_file_upload.html +++ b/app/templates/email_templates/email_private_file_upload.html @@ -4,7 +4,7 @@

- The following file(s) were added to {{ request_id }} and are private: + The following record(s) were added to {{ request_id }} and are private:

diff --git a/app/templates/email_templates/email_response_closing.html b/app/templates/email_templates/email_response_closing.html index b114d5b81..a55661f80 100644 --- a/app/templates/email_templates/email_response_closing.html +++ b/app/templates/email_templates/email_response_closing.html @@ -12,7 +12,9 @@ href="mailto:{{ agency_appeals_email }}?subject={{ request.id }}%20-%20Appeal">{{ agency_appeals_email }} within 30 days. +

{% endif %} + Please check your email inbox's spam folder to ensure you received all records provided by the agency. {% else %} {{ content | safe }} {% endif %} \ No newline at end of file diff --git a/app/templates/email_templates/email_response_file.html b/app/templates/email_templates/email_response_file.html index f438a91a6..67450e651 100644 --- a/app/templates/email_templates/email_response_file.html +++ b/app/templates/email_templates/email_response_file.html @@ -1,13 +1,13 @@ {% if default_content %}

The {{ agency_name }} has responded to your FOIL request {{ request_id }} with - the following file(s). + the following record(s).

{% if public_requester %}

- NOTE: You must be logged in to your OpenRecords account to access the file(s). + NOTE: You must be logged in to your OpenRecords account to access the record(s). If you are not logged in, you will be prompted to do so when the link is selected.

@@ -15,7 +15,7 @@ {% if release_public_links %}

- The file(s) listed below will be accessible to the public on the OpenRecords portal in 20 business days + The record(s) listed below will be accessible to the public on the OpenRecords portal in 20 business days ({{ moment(release_date).format('dddd, MMMM D, YYYY') }}).

@@ -29,7 +29,7 @@ {% if release_private_links %}

- The file(s) listed below will not be publicly available on the OpenRecords portal. + The record(s) listed below will not be publicly available on the OpenRecords portal.

    @@ -46,7 +46,7 @@ {% if release_private_links and not release_public_links %}

    - The file(s) listed below will not be publicly available on the OpenRecords portal. + The record(s) listed below will not be publicly available on the OpenRecords portal.

    diff --git a/app/templates/email_templates/response_file_links.html b/app/templates/email_templates/response_file_links.html index 7e5a6fb89..dad7a924e 100644 --- a/app/templates/email_templates/response_file_links.html +++ b/app/templates/email_templates/response_file_links.html @@ -9,7 +9,7 @@
{% if release_private_links %}

- The file(s) listed below will not be publicly available on the OpenRecords portal. + The record(s) listed below will not be publicly available on the OpenRecords portal.

    {% for file in release_private_links %} diff --git a/app/templates/request/events/modal_body/file_edited.html b/app/templates/request/events/modal_body/file_edited.html index 34a0886ed..2444cc24a 100644 --- a/app/templates/request/events/modal_body/file_edited.html +++ b/app/templates/request/events/modal_body/file_edited.html @@ -2,25 +2,25 @@
      {% if event.new_value.get('name') %}
    • - The file "{{ event.previous_value['name'] }}" was changed to + The record "{{ event.previous_value['name'] }}" was changed to "{{ event.new_value['name'] }}".
      • {% elif event.new_value.get('hash') %}
    • - The content of the file "{{ event.response.name }}" was changed. + The content of the record "{{ event.response.name }}" was changed.
      • {% endif %} {% if event.new_value.get('title') %}
    • - The file response title was changed from "{{ event.previous_value['title'] }}" to + The record response title was changed from "{{ event.previous_value['title'] }}" to "{{ event.new_value['title'] }}".
      • {% endif %} {% if event.new_value.get('privacy') %}
    • - The file response privacy was changed from + The record response privacy was changed from {% include "request/events/modal_body/base/privacy_change.html" %}
      • {% endif %} diff --git a/data/reasons.csv b/data/reasons.csv index b3106d061..6a8b80b52 100644 --- a/data/reasons.csv +++ b/data/reasons.csv @@ -11,7 +11,7 @@ "closing","Closed - Fulfilled via Walk In","Your request under the Freedom of Information Law (FOIL) has been fulfilled via walk in.","0056","True" "closing","Closed - CIS Case","Because you and/or your client have demonstrated that you have an interest in the subject accident, §66-a of the Public Officers Law, rather than FOIL, governs the extent of disclosure that is available to you, and affords you greater access than could be obtained under FOIL.","0056","True" "closing","Closed - CIS Case (Redacted)","Because you and/or your client have demonstrated that you have an interest in the subject accident, §66-a of the Public Officers Law, rather than FOIL, governs the extent of disclosure that is available to you, and affords you greater access than could be obtained under FOIL. Please note that if the case folder contained records that did not directly pertain to the accident, such records are not included in the provided document(s).","0056","True" -"closing","Closed - Requested Documents Provided","The requested documents were previously sent to you via email.","0056","True" +"closing","Closed - Requested Documents Provided","The requested documents were sent to you via email.","0056","True" "closing","Closed - Document List","Responsive to your request, the following document(s) have been accessed:

      ","0056","True" "closing","Closed - Personal Privacy - Redacted","Redactions have been made to the document(s) in that release of information would represent an unwarranted invasion of personal privacy {§ 87.2 (b)}.","0056","True" "closing","Closed - Endanger - Redacted","Redactions have been made to the document(s) in that release of information would endanger the life and safety of any person {§ 87.2 (f)}.","0056","True"