diff --git a/copyparty/up2k.py b/copyparty/up2k.py index 70a9bcb2..7a04dc76 100644 --- a/copyparty/up2k.py +++ b/copyparty/up2k.py @@ -545,7 +545,7 @@ class Up2k(object): nrm += 1 if nrm: - self.log("{} files graduated in {}".format(nrm, vp)) + self.log("%d files graduated in /%s" % (nrm, vp)) if timeout < 10: continue diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index 99aa7b68..36b3919f 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -464,7 +464,7 @@ var Ls = { "u_badf": 'These {0} files (of {1} total) were skipped, possibly due to filesystem permissions:\n\n', "u_blankf": 'These {0} files (of {1} total) are blank / empty; upload them anyways?\n\n', "u_just1": '\nMaybe it works better if you select just one file', - "u_ff_many": "This amount of files may cause Firefox to skip some files, or crash.\nPlease try again with fewer files (or use Chrome) if that happens.", + "u_ff_many": "if you're using Linux / MacOS / Android, then this amount of files may crash Firefox!\nif that happens, please try again (or use Chrome).", "u_up_life": "This upload will be deleted from the server\n{0} after it completes", "u_asku": 'upload these {0} files to {1}', "u_unpt": "you can undo / delete this upload using the top-left 🧯", @@ -486,8 +486,8 @@ var Ls = { "u_emtleak1": "it looks like your webbrowser may have a memory leak;\nplease", "u_emtleak2": ' switch to https (recommended) or ', "u_emtleak3": ' ', - "u_emtleakc": 'try the following:\nUploads will be a bit slower, but oh well.\nSorry for the trouble !\n\nPS: chrome v107 has a bugfix for this', - "u_emtleakf": 'try the following:\n\nPS: firefox will hopefully have a bugfix at some point', + "u_emtleakc": 'try the following:\nUploads will be a bit slower, but oh well.\nSorry for the trouble !\n\nPS: chrome v107 has a bugfix for this', + "u_emtleakf": 'try the following:\n\nPS: firefox will hopefully have a bugfix at some point', "u_s404": "not found on server", "u_expl": "explain", "u_maxconn": "most browsers limit this to 6, but firefox lets you raise it with connections-per-server in about:config", @@ -979,7 +979,7 @@ var Ls = { "u_badf": 'Disse {0} filene (av totalt {1}) kan ikke leses, kanskje pga rettighetsproblemer i filsystemet pĂ„ datamaskinen din:\n\n', "u_blankf": 'Disse {0} filene (av totalt {1}) er blanke / uten innhold; Ăžnsker du Ă„ laste dem opp uansett?\n\n', "u_just1": '\nFunker kanskje bedre hvis du bare tar Ă©n fil om gangen', - "u_ff_many": "Det var mange filer! Mulig at Firefox kommer til Ă„ krasje, eller\nhoppe over et par av dem. Smart Ă„ ha Chrome pĂ„ lur i tilfelle.", + "u_ff_many": 'Hvis du bruker Linux / MacOS / Android, sĂ„ kan dette antallet filer
kanskje krasje Firefox! Hvis det skjer, sĂ„ prĂžv igjen (eller bruk Chrome).', "u_up_life": "Filene slettes fra serveren {0}\netter at opplastningen er fullfĂžrt", "u_asku": 'Laste opp disse {0} filene til {1}', "u_unpt": "Du kan angre / slette opplastningen med 🧯 oppe til venstre", @@ -1001,8 +1001,8 @@ var Ls = { "u_emtleak1": "uff, det er mulig at nettleseren din har en minnelekkasje...\nForeslĂ„r", "u_emtleak2": ' helst at du bytter til https, eller ', "u_emtleak3": ' at du ', - "u_emtleakc": 'prĂžver fĂžlgende:\nOpplastning vil gĂ„ litt tregere, men det fĂ„r sĂ„ vĂŠre.\nBeklager bryderiet !\n\nPS: feilen skal vĂŠre fikset i chrome v107', - "u_emtleakf": 'prĂžver fĂžlgende:\n\nPS: Firefox fikser forhĂ„pentligvis feilen en eller annen gang', + "u_emtleakc": 'prĂžver fĂžlgende:\nOpplastning vil gĂ„ litt tregere, men det fĂ„r sĂ„ vĂŠre.\nBeklager bryderiet !\n\nPS: feilen skal vĂŠre fikset i chrome v107', + "u_emtleakf": 'prĂžver fĂžlgende:\n\nPS: Firefox fikser forhĂ„pentligvis feilen en eller annen gang', "u_s404": "ikke funnet pĂ„ serveren", "u_expl": "forklar", "u_maxconn": "de fleste nettlesere tillater ikke mer enn 6, men firefox lar deg Ăžke grensen med connections-per-server i about:config", @@ -3336,6 +3336,7 @@ function scan_hash(v) { function eval_hash() { + document.onkeydown = ahotkeys; window.onpopstate = treectl.onpopfun; if (hash0 && window.og_fn) { @@ -5232,7 +5233,9 @@ function tree_up(justgo) { if (!justgo) return; } - act.parentNode.parentNode.parentNode.getElementsByTagName('a')[1].click(); + var a = act.parentNode.parentNode.parentNode.getElementsByTagName('a')[1]; + if (a.parentNode.tagName == 'LI') + a.click(); } @@ -5295,7 +5298,7 @@ function fselfunw(e, ae, d, rem) { } selfun(); } -document.onkeydown = function (e) { +var ahotkeys = function (e) { if (e.altKey || e.isComposing) return; diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 3845ccc1..2e43dc79 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -1210,7 +1210,7 @@ function up2k_init(subtle) { match = false; if (match) { - var msg = ['directory iterator got stuck on the following {0} items; good chance your browser is about to spinlock: