nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

monkeysphere: Consistently use the term OpenPGP

Browse Source 
In user visible strings, instead of PGP or GPG.
This commit is contained in:
James Valleroy 2016-02-14 13:35:48 -05:00 committed by Sunil Mohan Adapa
parent fbbd70a642
commit 18db38002b
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plinth/modules/monkeysphere/__init__.py
View File

@ -30,12 +30,12 @@ depends = ['system']
title = _('Monkeysphere') title = _('Monkeysphere')
description = [ description = [
_('With Monkeysphere, a PGP key can be generated for each configured ' _('With Monkeysphere, an OpenPGP key can be generated for each configured '
'domain serving SSH. The PGP public key can then be uploaded to the PGP ' 'domain serving SSH. The OpenPGP public key can then be uploaded to the '
'keyservers. Users connecting to this machine through SSH can verify ' 'OpenPGP keyservers. Users connecting to this machine through SSH can '
'that they are connecting to the correct host. For users to trust the ' 'verify that they are connecting to the correct host. For users to '
'key, at least one person (usually the machine owner) must sign the key ' 'trust the key, at least one person (usually the machine owner) must '
'using the regular PGP key signing process. See the ' 'sign the key using the regular OpenPGP key signing process. See the '
'<a href="http://web.monkeysphere.info/getting-started-ssh/"> ' '<a href="http://web.monkeysphere.info/getting-started-ssh/"> '
'Monkeysphere SSH documentation</a> for more details.') 'Monkeysphere SSH documentation</a> for more details.')
] ]

4
plinth/modules/monkeysphere/templates/monkeysphere.html
View File

@ -53,7 +53,7 @@
<thead> <thead>
<tr> <tr>
<th>{% trans "Domain" %}</th> <th>{% trans "Domain" %}</th>
<th>{% trans "GPG Fingerprint" %}</th> <th>{% trans "OpenPGP Fingerprint" %}</th>
<th>{% trans "Actions" %}</th> <th>{% trans "Actions" %}</th>
</tr> </tr>
</thead> </thead>
@ -75,7 +75,7 @@
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary btn-sm pull-right"> <button type="submit" class="btn btn-primary btn-sm pull-right">
{% trans "Generate PGP Key" %}</button> {% trans "Generate OpenPGP Key" %}</button>
</form> </form>
{% elif not running %} {% elif not running %}
<form class="form" method="post" <form class="form" method="post"

6
plinth/modules/monkeysphere/views.py
View File

@ -48,14 +48,14 @@ def index(request):
@require_POST @require_POST
def generate(request, domain): def generate(request, domain):
"""Generate PGP key for SSH service.""" """Generate OpenPGP key for SSH service."""
valid_domain = any((domain in domains valid_domain = any((domain in domains
for domains in names.domains.values())) for domains in names.domains.values()))
if valid_domain: if valid_domain:
try: try:
actions.superuser_run( actions.superuser_run(
'monkeysphere', ['host-import-ssh-key', 'ssh://' + domain]) 'monkeysphere', ['host-import-ssh-key', 'ssh://' + domain])
messages.success(request, _('Generated PGP key.')) messages.success(request, _('Generated OpenPGP key.'))
except actions.ActionError as exception: except actions.ActionError as exception:
messages.error(request, str(exception)) messages.error(request, str(exception))
@ -64,7 +64,7 @@ def generate(request, domain):
@require_POST @require_POST
def publish(request, fingerprint): def publish(request, fingerprint):
"""Publish PGP key for SSH service.""" """Publish OpenPGP key for SSH service."""
global publish_process global publish_process
if not publish_process: if not publish_process:
publish_process = actions.superuser_run( publish_process = actions.superuser_run(