Merge pull request #7374 from freedomofpress/backport-7370

[2.11.0] Backport "chore: address feedback on source strings"

securedrop/journalist_templates/base.html

@@ -24,7 +24,7 @@
   </div>
   {% elif g.show_os_needs_migration_fixes %}
   <div id="os-near-eol" class="alert-banner">
-    {{ gettext('<strong>Important:</strong>&nbsp;&nbsp;Your SecureDrop server needs manual attention to resolve issues blocking automatic upgrade to the next operating system. Please contact your adminstrator. <a href="https://securedrop.org/focal-eol" rel="noreferrer">Learn More</a>') }}
+    {{ gettext('<strong>Important:</strong>&nbsp;&nbsp;Your SecureDrop server needs manual attention to resolve issues blocking automatic upgrade to the next operating-system version. Please contact your adminstrator. <a href="https://securedrop.org/focal-eol" rel="noreferrer">Learn More</a>') }}
   </div>
   {% endif %}
   <nav aria-label="{{ gettext('Navigation') }}">

securedrop/journalist_templates/index.html

@@ -80,7 +80,7 @@ <h1 id="all-sources-heading" class="headline">{{ gettext('All Sources') }}</h1>
     </table>
   </form>
   {% else %}
-  <p>{{ gettext('There are no submissions!') }}</p>
+  <p>{{ gettext('There are no submissions.') }}</p>
   {% endif %}
 </div>
 {% endblock %}

securedrop/source_templates/tor2web-warning.html

@@ -14,7 +14,7 @@ <h2>{{ gettext('Proxy Service Detected') }}</h2>
 <p>{{ gettext('Always use Tor Browser (<code>{}</code>) to access SecureDrop. Valid SecureDrop site addresses end with <code>.onion</code>. The correct address for this site is:').format("https://www.torproject.org/download/") }}
 <pre>{{ source_url }}</pre>
 </p>
-<p> {{ gettext ('If you are already using Tor Browser, copy the address above and generate a new identity before you access SecureDrop.') }} {{ gettext('Click the <img src={icon} alt="" width="16" height="16">&nbsp;<b>New Identity</b> button in your Tor Browser\'s toolbar. This will clear your Tor Browser activity data on this device.').format(icon=url_for('static', filename='i/torbroom.png'))  }}
+<p> {{ gettext ('If you are already using Tor Browser, copy the address above and click Tor Browser\'s <strong>New Identity</strong> button before you access SecureDrop.') }} {{ gettext('Click the <img src={icon} alt="" width="16" height="16">&nbsp;<b>New Identity</b> button in your Tor Browser\'s toolbar. This will clear your Tor Browser activity data on this device.').format(icon=url_for('static', filename='i/torbroom.png'))  }}
 </p>
 <p>{{ gettext('If there is a reasonable risk of your Internet traffic being monitored, consider connecting from a different location or network.') }}
 </p>

securedrop/tests/test_integration.py

@@ -432,7 +432,7 @@ def test_delete_collection(mocker, source_app, journalist_app, test_journo):
         text = resp.data.decode("utf-8")
         assert escape(f"The account and data for the source {col_name} have been deleted.") in text
 
-        assert "There are no submissions!" in text
+        assert "There are no submissions." in text
 
         # Make sure the collection is deleted from the filesystem
         def assertion():

securedrop/tests/test_journalist.py

@@ -365,7 +365,7 @@ def test_login_valid_credentials(config, journalist_app, test_journo, locale):
             follow_redirects=True,
         )
         assert page_language(resp.data) == language_tag(locale)
-        msgids = ["All Sources", "There are no submissions!"]
+        msgids = ["All Sources", "There are no submissions."]
         with xfail_untranslated_messages(config, locale, msgids):
             resp_text = resp.data.decode("utf-8")
             for msgid in msgids:

securedrop/translations/messages.pot

@@ -422,7 +422,7 @@ msgstr ""
 msgid "<strong>Critical:</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=\"https://securedrop.org/focal-eol\" rel=\"noreferrer\">Learn More</a>"
 msgstr ""
 
-msgid "<strong>Important:</strong>&nbsp;&nbsp;Your SecureDrop server needs manual attention to resolve issues blocking automatic upgrade to the next operating system. Please contact your adminstrator. <a href=\"https://securedrop.org/focal-eol\" rel=\"noreferrer\">Learn More</a>"
+msgid "<strong>Important:</strong>&nbsp;&nbsp;Your SecureDrop server needs manual attention to resolve issues blocking automatic upgrade to the next operating-system version. Please contact your adminstrator. <a href=\"https://securedrop.org/focal-eol\" rel=\"noreferrer\">Learn More</a>"
 msgstr ""
 
 msgid "Navigation"
@@ -717,7 +717,7 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-msgid "There are no submissions!"
+msgid "There are no submissions."
 msgstr ""
 
 msgid "Filter by codename"
@@ -1052,7 +1052,7 @@ msgstr ""
 msgid "Always use Tor Browser (<code>{}</code>) to access SecureDrop. Valid SecureDrop site addresses end with <code>.onion</code>. The correct address for this site is:"
 msgstr ""
 
-msgid "If you are already using Tor Browser, copy the address above and generate a new identity before you access SecureDrop."
+msgid "If you are already using Tor Browser, copy the address above and click Tor Browser's <strong>New Identity</strong> button before you access SecureDrop."
 msgstr ""
 
 msgid "If there is a reasonable risk of your Internet traffic being monitored, consider connecting from a different location or network."