From 1d31aab990ff312bbad5cc5e38db03e4842c4c08 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 5 Nov 2018 15:00:41 +0100 Subject: [PATCH] Display more warning messages about the full drive export --- customize.dist/main.js | 3 --- www/common/translations/messages.fr.js | 3 ++- www/common/translations/messages.js | 3 ++- www/settings/inner.js | 4 +++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/customize.dist/main.js b/customize.dist/main.js index 008226211..025106685 100644 --- a/customize.dist/main.js +++ b/customize.dist/main.js @@ -18,9 +18,6 @@ define([ window.location = '/drive/'; return; } - - $main.find('a[href="/drive/"] div.pad-button-text h4') - .text(Messages.main_yourCryptDrive); } $(window).click(function () { $('.cp-dropdown-content').hide(); diff --git a/www/common/translations/messages.fr.js b/www/common/translations/messages.fr.js index 332175fc9..33f0e34ea 100644 --- a/www/common/translations/messages.fr.js +++ b/www/common/translations/messages.fr.js @@ -564,7 +564,8 @@ define(function () { out.settings_backup2Confirm = "Vous allez télécharger tous les pads de votre CryptDrive. Si vous souhaitez continuer, choisissez un nom et appuyez sur OK."; out.settings_exportTitle = "Téléchargement de votre CryptDrive"; out.settings_exportDescription = "Veuillez patienter pendant que nous téléchargeons et déchiffrons vos documents. Cette opération peut prendre plusieurs minutes. Fermer l'onglet du navigateur interrompra le processus."; - out.settings_exportWarning = "Pour de meilleures performances, il est recommandé de ne pas changer d'onglet pendant le téléchargement."; + out.settings_exportFailed = "Si un pad nécessite plus d'une minute pour être traité, il ne sera pas inclus dans l'archive. Une liste des pads n'ayant pas été exportés sera disponible à la fin."; + out.settings_exportWarning = "Note: cet outil est encore un prototype et peut rencontrer des difficultés lors de l'export. Pour de meilleures performances, il est recommandé de ne pas changer d'onglet pendant le téléchargement."; out.settings_exportCancel = "Êtes-vous sûr de vouloir annuler ce téléchargement ? Vous devrez recommencer du début la prochaine fois."; out.settings_export_reading = "Lecture de votre CryptDrive..."; out.settings_export_download = "Téléchargement et déchiffrement des documents..."; diff --git a/www/common/translations/messages.js b/www/common/translations/messages.js index 67873791f..e1f11b0fb 100644 --- a/www/common/translations/messages.js +++ b/www/common/translations/messages.js @@ -569,7 +569,8 @@ define(function () { out.settings_backup2Confirm = "This will download all the pads and files from your CryptDrive. If you want to continue, pick a name and press OK"; out.settings_exportTitle = "Export your CryptDrive"; out.settings_exportDescription = "Please wait while we're downloading and decrypting your documents. This may take a few minutes. Closing the tab will interrupt the process."; - out.settings_exportWarning = "For better performance, it is recommended to leave this tab focused."; + out.settings_exportFailed = "If a pad requires more than 1 minute to be downloaded, it won't be included in the export. A link to any pad that has not been exported will be displayed."; + out.settings_exportWarning = "Note: this tool is still in a beta version and it might have scalability issues. For better performance, it is recommended to leave this tab focused."; out.settings_exportCancel = "Are you sure you want to cancel the export? You will have to start again from the beginning next time."; out.settings_export_reading = "Reading your CryptDrive..."; out.settings_export_download = "Downloading and decrypting your documents..."; diff --git a/www/settings/inner.js b/www/settings/inner.js index 0e0f12e19..4c315c745 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -832,7 +832,9 @@ define([ h('p', [ Messages.settings_exportDescription, h('br'), - Messages.settings_exportWarning + Messages.settings_exportFailed, + h('br'), + h('strong', Messages.settings_exportWarning), ]), progress, actions,