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/privatebin.js b/js/privatebin.js index 2ee9ad7e..acb3f4a0 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -930,7 +930,16 @@ jQuery.PrivateBin = (function($) { } // load strings from JSON - $.getJSON('i18n/' + newLanguage + '.json', function(data) { + let main_script = document.querySelector('script[src^="js/privatebin.js"]'); + let privatebin_version; + + if (main_script) { + privatebin_version = main_script.getAttribute("src").split("?")[1] || null; + } else { + privatebin_version = Math.floor(Date.now() / 60000); + } + + $.getJSON('i18n/' + newLanguage + '.json?v=' + privatebin_version, function(data) { language = newLanguage; translations = data; $(document).triggerHandler(languageLoadedEvent); @@ -5160,7 +5169,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 +5440,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 +5718,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..4e4befad 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -121,7 +121,7 @@ class Configuration 'js/kjua-0.10.0.js' => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==', 'js/legacy.js' => 'sha512-08+subq1Lo+r+la5ENqeXiMgNJcVaaTtBIFGkrjziSpvtgCId3Jtin4/OkSdHYSoeztwwIab8uvCzPKHta6puQ==', 'js/prettify.js' => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==', - 'js/privatebin.js' => 'sha512-Cor4acli/veLhX81YVTGQNkQ+poXsz0gRQUmLeJ6WebIXUlUi7ZQZ6lk1oIYesnBG3cV/stVT07cdVsByXoaJA==', + 'js/privatebin.js' => 'sha512-8LoAQt1Vh/P7KssjSADoK79ndleOIvyRXIuG0JgYsQULw7feo8oO5Labu4a1AhxrdiLu+uZFUj3Th22HYGvD8A==', '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==',