Update confirmation message in the export assistant

1. Split big message into two small messages
2. Reorder buttons names to real button order
This commit is contained in:
Stanislav Bolshakov 2021-06-05 15:00:31 +03:00 committed by Nick Hall
parent 3b92c53822
commit 355f98db5f

View File

@ -448,11 +448,12 @@ class ExportAssistant(ManagedWindow, Gtk.Assistant):
hasattr(self.option_box_instance, "no_fileselect")): hasattr(self.option_box_instance, "no_fileselect")):
# No file selection # No file selection
filename = '' filename = ''
confirm_text = _( confirm_text = (
'The data will be exported as follows:\n\n' _('The data will be exported as follows:\n\n'
'Format:\t%s\n\n' 'Format:\t%s'
'Press Apply to proceed, Back to revisit ' ) % (format.replace("_",""), ) + '\n\n' +
'your options, or Cancel to abort') % (format.replace("_",""), ) _('Press Cancel to abort, Back to revisit '
'your options, or Apply to proceed'))
page_complete = True page_complete = True
else: else:
#Allow for exotic error: file is still not correct #Allow for exotic error: file is still not correct
@ -462,17 +463,16 @@ class ExportAssistant(ManagedWindow, Gtk.Assistant):
name = os.path.split(filename)[1] name = os.path.split(filename)[1]
folder = os.path.split(filename)[0] folder = os.path.split(filename)[0]
confirm_text = _( confirm_text = _(
'The data will be saved as follows:\n\n' _('The data will be saved as follows:\n\n'
'Format:\t%(format)s\nName:\t%(name)s\nFolder:\t%(folder)s\n\n' 'Format:\t%(format)s\nName:\t%(name)s\nFolder:\t%(folder)s'
'Press Apply to proceed, Go Back to revisit ' ) % {'format': format.replace("_",""),
'your options, or Cancel to abort') % { 'name': name, 'folder': folder} + '\n\n' +
'format': format.replace("_",""), _('Press Cancel to abort, Back to revisit '
'name': name, 'your options, or Apply to proceed'))
'folder': folder}
page_complete = True page_complete = True
else : else :
confirm_text = _( confirm_text = _(
'The selected file and folder to save to ' 'The selected file and folder to save '
'cannot be created or found.\n\n' 'cannot be created or found.\n\n'
'Press Back to return and select a valid filename.' 'Press Back to return and select a valid filename.'
) )