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 fixes based on translator feedback #5391

Closed
wants to merge 15 commits into from
Closed

Conversation

eloquence
Copy link
Member

@eloquence eloquence commented Jul 20, 2020

Status

Ready for initial comments.

Will squash prior to promoting from draft.

Note: This PR is targeting 1.6.0, not 1.5.0.

eloquence and others added 11 commits July 20, 2020 15:31
@eloquence eloquence added this to Ready for Review in SecureDrop Team Board Jul 21, 2020
rmol
rmol previously approved these changes Jul 21, 2020
Copy link
Contributor

@rmol rmol left a comment

Choose a reason for hiding this comment

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

These changes all look good to me. I have one optional suggestion.

@@ -14,10 +14,10 @@ <h1>{{ gettext("Why download the team's public key?") }}</h1>
<li>{{ gettext('Encrypt your submission.') }}
<ol>
<li>{{ gettext('You will need to be able to identify the key (this is called the "user ID" or UID). Since the public key\'s filename is the key\'s fingerprint (with .asc at the end), you can just copy and paste that. (don\'t include the <code>.asc</code>!)')|safe }}</li>
<li>{{ gettext('On all systems, open the Terminal and use this gpg command: <code>gpg --recipient &lt;user ID&gt; --encrypt roswell_photos.pdf</code>')|safe }}</li>
<li>{{ gettext('On all systems, open the terminal and use this gpg command, replacing <code>&lt;user ID&gt;</code> and <code>&lt;filename&gt;</code> with their values:<br><code>gpg --recipient &lt;user ID&gt; --encrypt &lt;filename&gt;</code>')|safe }}</li>
Copy link
Contributor

Choose a reason for hiding this comment

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

Eliminating the Roswell references is good, but I wonder if we want to avoid greater-than and less-than symbols in example commands, to avoid shell redirection problems if they're blindly copied and pasted. It was like this before, but we could take the opportunity to quote the example user ID and filename instead.

Copy link
Member Author

@eloquence eloquence Jul 22, 2020

Choose a reason for hiding this comment

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

This is scope creeping a little bit, but what do you think about the approach in f836393 of just pulling in the fingerprint so we don't have to use roundabout ways to describe it?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's better. I added the actual filename to the import command too, and tweaked the formatting of the commands.

Copy link
Member Author

Choose a reason for hiding this comment

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

A bit of whitespace does wonders sometimes. Thanks @rmol, that looks good to me. I'll close this draft, squash, and open a new PR from a new branch name, since that change goes a bit beyond minor fixes at this point.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants