mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2025-11-27 01:36:43 -05:00
Merge branch 'master' into karthikkasturi-master
This commit is contained in:
commit
2e5d6dddac
10 changed files with 92 additions and 15 deletions
|
|
@ -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);
|
||||
|
|
@ -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
|
||||
|
|
@ -5776,7 +5777,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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue