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.

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

String tweaks in response to feedback; add fingerprint to template #5399

Merged
merged 1 commit into from Jul 30, 2020

Conversation

eloquence
Copy link
Member

Status

Ready for review. NB: This change is targeting SecureDrop 1.6.0, and does not need to be backported to 1.5.0.

Description

Misc. changes based on translator feedback, plus a change to the way that the submission key fingerprint is presented in the Source Interface:

  • Add '.' to some messages [1] [2] [3]
  • Simplify and shorten validation warnings [4]
  • Tweak error message for bad form data case [5]
  • Avoid idiosyncratic ampersand usage per [6]
  • Pull closing tag into source string [7]
  • Change "Security Setting" to "Security Level", which is what Tor Browser now uses [8]
  • Desktop versions->desktop version [9]
  • Add submission key fingerprint to the "Why Journalist Key" template, to avoid convoluted instructions there; remove reference to UFO incident

(This change was done in collaboration with @rmol and only possible thanks to the feedback provided by many translators.)

[1] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=8e012ca12dd735dc#comments
[2] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=e2291f9285fe59af#comments
[3] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=782cc89459efa038#comments
[4] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=4422f6d628edc7de#comments
[5] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=511d2e2028f7fe91#comments
[6] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=aa334ee40ac41bf#comments
[7] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=486d7cd4ec4458de#comments
[8] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=8a1dbec76ada33ea#comments
[9] https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=2f7252b4a244f071#comments

Test plan

For the fingerprint changes:

  • Spin up this branch in the development environment
  • Observe that the fingerprint is rendered correctly on http://localhost:8080/why-journalist-key and that the instructions make sense.

Checklist

  • docs-lint passes
  • make test passes (waiting for CI)

@eloquence
Copy link
Member Author

(@rmol reviewed a prior version of this PR, and contributed to it, see here for history: #5391 (review))

@eloquence eloquence added this to Ready for Review in SecureDrop Team Board Jul 23, 2020
Copy link
Contributor

@gonzalo-bulnes gonzalo-bulnes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what is worth, the changes match the comments I've seen in Weblate and I see no typos. 👍

@zenmonkeykstop zenmonkeykstop self-assigned this Jul 29, 2020
@eloquence eloquence added this to the 1.6.0 milestone Jul 29, 2020
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor nit, but looking good otherwise. Approving and thanks to all involved in these changes!

docs/source.rst Show resolved Hide resolved
@zenmonkeykstop zenmonkeykstop merged commit 2eb7fa8 into develop Jul 30, 2020
SecureDrop Team Board automation moved this from Ready for Review to Done Jul 30, 2020
gonzalo-bulnes added a commit to gonzalo-bulnes/securedrop that referenced this pull request Aug 13, 2020
gonzalo-bulnes added a commit to gonzalo-bulnes/securedrop that referenced this pull request Aug 13, 2020
gonzalo-bulnes added a commit to gonzalo-bulnes/securedrop that referenced this pull request Aug 14, 2020
gonzalo-bulnes added a commit to gonzalo-bulnes/securedrop that referenced this pull request Aug 15, 2020
gonzalo-bulnes added a commit to gonzalo-bulnes/securedrop that referenced this pull request Aug 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants