diff --git a/i18n/fr.json b/i18n/fr.json index 17b93f7a..ad71679e 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -224,7 +224,7 @@ "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Erreur lors de la décompression du document, votre navigateur ne supporte pas WebAssembly. Veuillez utiliser un autre navigateur pour voir ce document.", "Start over": "Recommencer", "Document copied to clipboard": "Document copié dans le presse-papier", - "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "Pour copier-coller appuyer sur le bouton To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c", + "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "Pour copier appuyer sur le bouton Copier le lien ou utiliser le raccourci Ctrl+c/Cmd+c", "Copy link": "Copier le lien", "Link copied to clipboard": "Lien copié dans le presse-papier", "Document text": "Texte du document", diff --git a/js/legacy.js b/js/legacy.js index 5d6dbc0b..1f27107b 100644 --- a/js/legacy.js +++ b/js/legacy.js @@ -106,8 +106,8 @@ return window.isSecureContext; } - // HTTP is obviously insecure - if (window.location.protocol !== 'http:') { + // HTTPS is considered secure + if (window.location.protocol === 'https:') { return true; } diff --git a/js/privatebin.js b/js/privatebin.js index 2ee9ad7e..4e765db3 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -930,7 +930,8 @@ jQuery.PrivateBin = (function($) { } // load strings from JSON - $.getJSON('i18n/' + newLanguage + '.json', function(data) { + const cacheBreaker = document.querySelector('script[src^="js/privatebin.js"]').getAttribute("src").split(".js")[1] || ""; + $.getJSON('i18n/' + newLanguage + '.json' + cacheBreaker, function(data) { language = newLanguage; translations = data; $(document).triggerHandler(languageLoadedEvent); @@ -2132,7 +2133,7 @@ jQuery.PrivateBin = (function($) { // if so, we send the link to the shortener // we do not remove the button, in case shortener fails sendToShortener(); - } + } } /** @@ -5160,7 +5161,7 @@ jQuery.PrivateBin = (function($) { // UI loading state TopNav.hideAllButtons(); - Alert.showLoading('Sending paste…', 'cloud-upload'); + Alert.showLoading('Sending document…', 'cloud-upload'); TopNav.collapseBar(); // get data @@ -5431,7 +5432,7 @@ jQuery.PrivateBin = (function($) { { Alert.hideMessages(); Alert.setCustomHandler(null); - Alert.showLoading('Decrypting paste…', 'cloud-download'); + Alert.showLoading('Decrypting document…', 'cloud-download'); if (typeof paste === 'undefined' || paste.type === 'click') { // get cipher data and wait until it is available @@ -5709,7 +5710,7 @@ jQuery.PrivateBin = (function($) { // Important: This *must not* run Alert.hideMessages() as previous // errors from viewing a document should be shown. TopNav.hideAllButtons(); - Alert.showLoading('Preparing new paste…', 'time'); + Alert.showLoading('Preparing new document…', 'time'); PasteStatus.hideMessages(); PasteViewer.hide(); diff --git a/lib/Configuration.php b/lib/Configuration.php index b139903e..b5ee90b5 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -119,9 +119,9 @@ class Configuration 'js/dark-mode-switch.js' => 'sha512-BhY7dNU14aDN5L+muoUmA66x0CkYUWkQT0nxhKBLP/o2d7jE025+dvWJa4OiYffBGEFgmhrD/Sp+QMkxGMTz2g==', 'js/jquery-3.7.1.js' => 'sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==', 'js/kjua-0.10.0.js' => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==', - 'js/legacy.js' => 'sha512-08+subq1Lo+r+la5ENqeXiMgNJcVaaTtBIFGkrjziSpvtgCId3Jtin4/OkSdHYSoeztwwIab8uvCzPKHta6puQ==', + 'js/legacy.js' => 'sha512-mXAgFn/DonfPANvPO6Kf08zRKCeQ75jXK69gcUUOpPLFkp3KHnDhnvij8nEJxlutD/670Bfi4RNMG6uEjA4nNQ==', 'js/prettify.js' => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==', - 'js/privatebin.js' => 'sha512-Cor4acli/veLhX81YVTGQNkQ+poXsz0gRQUmLeJ6WebIXUlUi7ZQZ6lk1oIYesnBG3cV/stVT07cdVsByXoaJA==', + 'js/privatebin.js' => 'sha512-Id47n8ZPz6j93KoR7DkaS48MxtwKftVq3RyZw9WRGpRT+6bYKP/ZkU84RscbcW3icxBTS9fQKQpdnmZ3rr00dQ==', 'js/purify-3.2.6.js' => 'sha512-zqwL4OoBLFx89QPewkz4Lz5CSA2ktU+f31fuECkF0iK3Id5qd3Zpq5dMby8KwHjIEpsUgOqwF58cnmcaNem0EA==', 'js/showdown-2.1.0.js' => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==', 'js/zlib-1.3.1-1.js' => 'sha512-5bU9IIP4PgBrOKLZvGWJD4kgfQrkTz8Z3Iqeu058mbQzW3mCumOU6M3UVbVZU9rrVoVwaW4cZK8U8h5xjF88eQ==',