Merge pull request #5895 from freedomofpress/wordlist-removals

Wordlist removals and translation updates for next SecureDrop release
freedomofpress · Jun 8, 2021 · 3d46171 · 3d46171
2 parents f318065 + c16c952
commit 3d46171
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/securedrop/dictionaries/adjectives.txt b/securedrop/dictionaries/adjectives.txt
@@ -1110,7 +1110,6 @@ casebook
 cased
 cast-iron
 cast-off
-castrated
 casual
 catalytic
 catastrophic
@@ -3396,7 +3395,6 @@ histological
 historic
 historical
 histrionic
-hit-and-run
 hitless
 hoary
 holey

diff --git a/securedrop/dictionaries/nouns.txt b/securedrop/dictionaries/nouns.txt
@@ -11607,8 +11607,6 @@ pedal
 pedant
 pedantry
 peddler
-pederast
-pederasty
 pedestal
 pedestrian
 pediatrics

diff --git a/securedrop/journalist_app/utils.py b/securedrop/journalist_app/utils.py
@@ -326,7 +326,7 @@ def col_delete(cols_selected: List[str]) -> werkzeug.Response:
         num = len(cols_selected)
 
         success_message = ngettext(
-            "The account and all data for {n} source have been deleted.",
+            "The account and all data for the source have been deleted.",
             "The accounts and all data for {n} sources have been deleted.",
             num).format(n=num)
 

diff --git a/securedrop/tests/functional/journalist_navigation_steps.py b/securedrop/tests/functional/journalist_navigation_steps.py
@@ -169,7 +169,9 @@ def _journalist_clicks_delete_collections_on_second_modal(self):
         def collection_deleted():
             if not self.accept_languages:
                 flash_msg = self.driver.find_element_by_css_selector(".flash")
-                assert "The account and all data for 1 source have been deleted." in flash_msg.text
+                assert (
+                    "The account and all data for the source have been deleted." in flash_msg.text
+                )
 
         self.wait_for(collection_deleted)