From 9caf9d482d91ab3c74e4b3060c36350dd620555b Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Thu, 9 May 2019 17:51:53 -0700 Subject: [PATCH] Update messages for manually flagged sources for accuracy The key issue here is that the previous message told sources that their submission had only just been passed through, which is not true. This message is also significantly shorter. Removed the icon, as the "relieved face" emoji, which is only used for this message, is no longer a good fit with the revised text. Resolves #4420 --- .../files/usr.sbin.apache2 | 1 - securedrop/source_templates/lookup.html | 8 +++----- securedrop/static/i/relieved_face.png | Bin 3271 -> 0 bytes 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 securedrop/static/i/relieved_face.png diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 index 7f3f80e29a..63282e1439 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 @@ -267,7 +267,6 @@ /var/www/securedrop/static/i/toronion.png r, /var/www/securedrop/static/i/hand_with_fingerprint.png r, /var/www/securedrop/static/i/success_checkmark.png r, - /var/www/securedrop/static/i/relieved_face.png r, /var/www/securedrop/static/i/server_upload.png r, /var/www/securedrop/static/i/tipbox/tipbox-hed-j-all.png r, /var/www/securedrop/static/i/tipbox/tipbox-hed-submit1.png r, diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html index 7ab23a4be2..672ecb6ce7 100644 --- a/securedrop/source_templates/lookup.html +++ b/securedrop/source_templates/lookup.html @@ -6,12 +6,10 @@ {% if flagged and not haskey %}
- relieved-face
- {{ gettext('Whew, it’s you! Now, the embarrassing part...') }} -

{{ gettext('Our servers experienced an unusual surge of new activity, when you last visited. To err on the side of caution, we put a hold on sending all files and messages from that day through to our journalists.') }}

- -

{{ gettext('Now that we know you’re really a human, though, we’ll get your previous submission into the hands of a journalist straight away. We’re sorry for the delay. Please do check back again in a week or so.') }}

+ {{ gettext('Sorry we haven\'t responded yet!') }} +

{{ gettext('Our SecureDrop recently experienced a surge of activity. For security reasons, the creation of a two-way communication channel was delayed until you checked in again.') }}

+

{{ gettext('Please rest assured that we were able to download your submission, and check back again later for a reply.') }}

{% endif %} diff --git a/securedrop/static/i/relieved_face.png b/securedrop/static/i/relieved_face.png deleted file mode 100644 index 872fe2c937afc620eba9c54b4497967620d4d4ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3271 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