Merge pull request #5827 from freedomofpress/1_8_0-string-feedback

String tweaks & fixes in response to translator feedback

securedrop/journalist_app/col.py

@@ -70,7 +70,7 @@ def delete_single(filesystem_id: str) -> werkzeug.Response:
                     # confirming the success of an operation.
                     escape(gettext("Success!")),
                     escape(gettext(
-                        "The account and data for the source {} has been deleted.").format(
+                        "The account and data for the source {} have been deleted.").format(
                             source.journalist_designation))
                 )
             ), 'success')

securedrop/journalist_templates/_sources_confirmation_final_modal.html

@@ -4,7 +4,7 @@
     <p>
       {{ gettext('When the account for a source is deleted:') }}
       <ul>
-        <li>{{ gettext('The source will not be able to log in with their codename again.') }}</li>
+        <li>{{ gettext('The source will no longer be able to log in with their codename.') }}</li>
         <li>{{ gettext('You will not be able to send them replies.') }}</li>
         <li>{{ gettext('All files and messages from that source will also be destroyed.') }}</li>
       </ul>

securedrop/journalist_templates/base.html

@@ -21,11 +21,11 @@
     {% if g.user %}
     {% if g.show_os_past_eol_warning %}
     <div id="os-past-eol" class="alert-banner">
-      <img src="{{ url_for('static', filename='i/bang-circle.png') }}" width="20" height="20"> {{ gettext ('<strong>Critical Security:</strong>&nbsp;&nbsp;The operating system used by your SecureDrop servers has reached its end-of-life. A manual update is required to re-enable the Source Interface and remain safe. Please contact your administrator. <a href="//securedrop.org/xenial-eol" rel="noreferrer">Learn More</a>') }}
+      <img src="{{ url_for('static', filename='i/bang-circle.png') }}" width="20" height="20"> {{ gettext ('<strong>Critical Security:</strong>&nbsp;&nbsp;The operating system used by your SecureDrop servers has reached its end-of-life. A manual upgrade is required to re-enable the Source Interface and remain safe. Please contact your administrator. <a href="//securedrop.org/xenial-eol" rel="noreferrer">Learn More</a>') }}
     </div>
     {% elif g.show_os_near_eol_warning %}
     <div id="os-near-eol" class="alert-banner">
-      <img src="{{ url_for('static', filename='i/bang-circle.png') }}" width="20" height="20"> {{ gettext ('<strong>Critical Security:</strong>&nbsp;&nbsp;The operating system used by your SecureDrop servers will reach its end-of-life on April 30, 2021. A manual update is urgently required to remain safe. Please contact your adminstrator. <a href="//securedrop.org/xenial-eol" rel="noreferrer">Learn More</a>') }}
+      <img src="{{ url_for('static', filename='i/bang-circle.png') }}" width="20" height="20"> {{ gettext ('<strong>Critical Security:</strong>&nbsp;&nbsp;The operating system used by your SecureDrop servers will reach its end-of-life on April 30, 2021. A manual upgrade is urgently required to remain safe. Please contact your administrator. <a href="//securedrop.org/xenial-eol" rel="noreferrer">Learn More</a>') }}
     </div>
     {% endif %}
 

securedrop/tests/test_integration.py

@@ -507,7 +507,7 @@ def test_delete_collection(mocker, source_app, journalist_app, test_journo):
 
         text = resp.data.decode('utf-8')
         assert escape(
-            "The account and data for the source {} has been deleted.".format(col_name)) in text
+            "The account and data for the source {} have been deleted.".format(col_name)) in text
 
         assert "No documents have been submitted!" in text
         assert async_genkey.called