From ca9faa0056e9f8b66cbbe9882b7ea32ac006acfc Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 13 Mar 2017 11:49:40 +0100 Subject: [PATCH] Fix wrong translation keys --- customize.dist/translations/messages.js | 4 ++-- www/settings/main.js | 1 - www/slide/main.js | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 73c38d979..8058f1912 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -261,8 +261,8 @@ define(function () { out.settings_importTitle = "Import this browser's recent pads in my CryptDrive"; out.settings_import = "Import"; - out.settings_confirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?"; - out.settings_done = "Import completed"; + out.settings_importConfirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?"; + out.settings_importDone = "Import completed"; out.settings_userFeedbackHint1 = "CryptPad provides some very basic feedback to the server, to let us know how to improve your experience."; out.settings_userFeedbackHint2 = "Your pad's content will never be shared with the server."; diff --git a/www/settings/main.js b/www/settings/main.js index cf3f221c0..a158225fc 100644 --- a/www/settings/main.js +++ b/www/settings/main.js @@ -224,7 +224,6 @@ define([ var $ok = $('', {'class': 'fa fa-check', title: Messages.saved}).hide().appendTo($div); var $spinner = $('', {'class': 'fa fa-spinner fa-pulse'}).hide().appendTo($div); - $button.click(function () { Cryptpad.confirm(Messages.settings_importConfirm, function (yes) { if (!yes) { return; } diff --git a/www/slide/main.js b/www/slide/main.js index e11250ae0..2e1cca8a8 100644 --- a/www/slide/main.js +++ b/www/slide/main.js @@ -454,8 +454,7 @@ define([ var fixCSS = function (css) { var append = '.cp #print '; - css = css.replace(/(\n*)([^\n]+)\s*\{/g, '$1' + append + '$2 {') - return css; + return css.replace(/(\n*)([^\n]+)\s*\{/g, '$1' + append + '$2 {'); }; var todo = function () {