Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wordlist removals and translation updates for next SecureDrop release #5895

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Wordlist removals and translation updates for next SecureDrop release #5895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a0fae
April 2021 wordlist removals
eloquence Apr 9, 2021
c16c952
Clearer language for single source deletion
eloquence Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions securedrop/dictionaries/adjectives.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,6 @@ casebook
cased
cast-iron
cast-off
castrated
casual
catalytic
catastrophic
Expand Down Expand Up @@ -3396,7 +3395,6 @@ histological
historic
historical
histrionic
hit-and-run
hitless
hoary
holey
Expand Down
2 changes: 0 additions & 2 deletions securedrop/dictionaries/nouns.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11607,8 +11607,6 @@ pedal
pedant
pedantry
peddler
pederast
pederasty
pedestal
pedestrian
pediatrics
Expand Down
2 changes: 1 addition & 1 deletion securedrop/journalist_app/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion securedrop/tests/functional/journalist_navigation_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down