Skip to content

Commit

Permalink
Tweak print/export dialog texts per messages audit
Browse files Browse the repository at this point in the history
  • Loading branch information
@eloquence @sssoleileraaa
eloquence authored and sssoleileraaa committed Mar 20, 2020
1 parent 4020c51 commit be43e33
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
24 changes: 12 additions & 12 deletions securedrop_client/gui/widgets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2554,15 +2554,15 @@ def __init__(self, controller: Controller, file_uuid: str, file_name: str):
'Preparing to print:'
'<br />'
'<span style="font-weight:normal">{}</span>'.format(self.file_name))
self.insert_usb_header = _('Insert USB printer')
self.error_header = _('Unable to print')
self.insert_usb_header = _('Connect USB printer')
self.error_header = _('Printing failed')
self.starting_message = _(
'<h2>Managing printout risks</h2>'
'<b>QR-Codes and visible web addresses</b>'
'<b>QR codes and web addresses</b>'
'<br />'
'Never open web addresses or scan QR codes contained in printed documents without '
'taking security precautions. If you are unsure how to manage this risk, please '
'contact your administrator.'
'Never type in and open web addresses or scan QR codes contained in printed '
'documents without taking security precautions. If you are unsure how to '
'manage this risk, please contact your administrator.'
'<br /><br />'
'<b>Printer dots</b>'
'<br />'
Expand Down Expand Up @@ -2691,20 +2691,20 @@ def __init__(self, controller: Controller, file_uuid: str, file_name: str):
self.insert_usb_header = _('Insert encrypted USB drive')
self.passphrase_header = _('Enter passphrase for USB drive')
self.success_header = _('Export successful')
self.error_header = _('Unable to export')
self.error_header = _('Export failed')
self.starting_message = _(
'<h2>Proceed with caution when exporting files</h2>'
'<h2>Understand the risks before exporting files</h2>'
'<b>Malware</b>'
'<br />'
'This workstation lets you open documents securely. If you open documents on another '
'This workstation lets you open files securely. If you open files on another '
'computer, any embedded malware may spread to your computer or network. If you are '
'unsure how to manage this risk, please print the document, or contact your '
'unsure how to manage this risk, please print the file, or contact your '
'administrator.'
'<br /><br />'
'<b>Anonymity</b>'
'<br />'
'Documents submitted by sources may contain information or hidden metadata that '
'identifies who they are. To protect your sources, please consider redacting documents '
'Files submitted by sources may contain information or hidden metadata that '
'identifies who they are. To protect your sources, please consider redacting files '
'before working with them on network-connected computers.')
self.exporting_message = _('Exporting: {}'.format(self.file_name))
self.insert_usb_message = _(
Expand Down
24 changes: 12 additions & 12 deletions tests/gui/test_widgets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2233,18 +2233,18 @@ def test_ExportDialog__show_starting_instructions(mocker):
'<br />' \
'<span style="font-weight:normal">mock.jpg</span>'
assert dialog.body.text() == \
'<h2>Proceed with caution when exporting files</h2>' \
'<h2>Understand the risks before exporting files</h2>' \
'<b>Malware</b>' \
'<br />' \
'This workstation lets you open documents securely. If you open documents on another ' \
'This workstation lets you open files securely. If you open files on another ' \
'computer, any embedded malware may spread to your computer or network. If you are ' \
'unsure how to manage this risk, please print the document, or contact your ' \
'unsure how to manage this risk, please print the file, or contact your ' \
'administrator.' \
'<br /><br />' \
'<b>Anonymity</b>' \
'<br />' \
'Documents submitted by sources may contain information or hidden metadata that ' \
'identifies who they are. To protect your sources, please consider redacting documents ' \
'Files submitted by sources may contain information or hidden metadata that ' \
'identifies who they are. To protect your sources, please consider redacting files ' \
'before working with them on network-connected computers.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand Down Expand Up @@ -2360,7 +2360,7 @@ def test_ExportDialog__show_generic_error_message(mocker):

dialog._show_generic_error_message()

assert dialog.header.text() == 'Unable to export'
assert dialog.header.text() == 'Export failed'
assert dialog.body.text() == 'mock_error_status: See your administrator for help.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand Down Expand Up @@ -2603,11 +2603,11 @@ def test_PrintDialog__show_starting_instructions(mocker):
'<span style="font-weight:normal">mock.jpg</span>'
assert dialog.body.text() == \
'<h2>Managing printout risks</h2>' \
'<b>QR-Codes and visible web addresses</b>' \
'<b>QR codes and web addresses</b>' \
'<br />' \
'Never open web addresses or scan QR codes contained in printed documents without ' \
'taking security precautions. If you are unsure how to manage this risk, please ' \
'contact your administrator.' \
'Never type in and open web addresses or scan QR codes contained in printed ' \
'documents without taking security precautions. If you are unsure how to ' \
'manage this risk, please contact your administrator.' \
'<br /><br />' \
'<b>Printer dots</b>' \
'<br />' \
Expand All @@ -2629,7 +2629,7 @@ def test_PrintDialog__show_insert_usb_message(mocker):

dialog._show_insert_usb_message()

assert dialog.header.text() == 'Insert USB printer'
assert dialog.header.text() == 'Connect USB printer'
assert dialog.body.text() == 'Please connect your printer to a USB port.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand All @@ -2647,7 +2647,7 @@ def test_PrintDialog__show_generic_error_message(mocker):

dialog._show_generic_error_message()

assert dialog.header.text() == 'Unable to print'
assert dialog.header.text() == 'Printing failed'
assert dialog.body.text() == 'mock_error_status: See your administrator for help.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand Down

0 comments on commit be43e33

Please sign in to comment.