From 3524c36e1b2a01831b3743cd04a61c8288f1073c Mon Sep 17 00:00:00 2001 From: ed Date: Sun, 22 May 2022 16:04:10 +0200 Subject: [PATCH] tl --- copyparty/web/browser.js | 20 ++++++++++++++++++++ copyparty/web/up2k.js | 15 ++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index 95d50c26..10922d90 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -309,6 +309,16 @@ var Ls = { "ue_la": 'you are currently logged in as "{0}"', "ue_sr": 'you are currently in file-search mode\n\nswitch to upload-mode by clicking the magnifying glass 🔎 (next to the big SEARCH button), and try uploading again\n\nsorry', "ue_ta": 'try uploading again, it should work now', + "ur_1uo": "OK: File uploaded successfully", + "ur_auo": "OK: All {0} files uploaded successfully", + "ur_1so": "OK: File found on server", + "ur_aso": "OK: All {0} files found on server", + "ur_1un": "Upload failed, sorry", + "ur_aun": "All {0} uploads failed, sorry", + "ur_1sn": "File was NOT found on server", + "ur_asn": "The {0} files were NOT found on server", + "ur_um": "Finished;\n{0} uplads OK,\n{1} uploads failed, sorry", + "ur_sm": "Finished;\n{0} files found on server,\n{1} files NOT found on server", "lang_set": "refresh to make the change take effect?", }, @@ -619,6 +629,16 @@ var Ls = { "ue_la": 'du er logget inn som "{0}"', "ue_sr": 'du er i filsĂžk-modus\n\nbytt til opplastning ved Ă„ klikke pĂ„ forstĂžrrelsesglasset 🔎 (ved siden av den store FILSØK-knappen) og prĂžv igjen\n\nsorry', "ue_ta": 'prĂžv Ă„ laste opp igjen, det burde funke nĂ„', + "ur_1uo": "OK: Filen ble lastet opp", + "ur_auo": "OK: Alle {0} filene ble lastet opp", + "ur_1so": "OK: Filen ble funnet pĂ„ serveren", + "ur_aso": "OK: Alle {0} filene ble funnet pĂ„ serveren", + "ur_1un": "Opplastning feilet!", + "ur_aun": "Alle {0} opplastningene gikk feil!", + "ur_1sn": "Filen finnes IKKE pĂ„ serveren", + "ur_asn": "Fant INGEN av de {0} filene pĂ„ serveren", + "ur_um": "Ferdig;\n{0} opplastninger gikk bra,\n{1} opplastninger gikk feil", + "ur_sm": "Ferdig;\n{0} filer ble funnet,\n{1} filer finnes IKKE pĂ„ serveren", "lang_set": "passer det Ă„ laste siden pĂ„ nytt?", }, diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 9fac3d99..572263ca 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -1249,24 +1249,21 @@ function up2k_init(subtle) { donut.on(is_busy); if (!is_busy) { - var k = uc.fsearch ? 'searches' : 'uploads', - ks = uc.fsearch ? 'Search' : 'Upload', - tok = uc.fsearch ? 'successful (found on server)' : 'completed successfully', - tng = uc.fsearch ? 'failed (NOT found on server)' : 'failed, sorry', + var sr = uc.fsearch, ok = pvis.ctr["ok"], ng = pvis.ctr["ng"], t = uc.ask_up ? 0 : 10; if (ok && ng) - toast.warn(t, 'Finished, but some {0} failed:\n{1} {2},\n{3} {4}'.format(k, ok, tok, ng, tng)); + toast.warn(t, (sr ? L.ur_sm : L.ur_um).format(ok, ng)); else if (ok > 1) - toast.ok(t, 'All {1} {0} {2}'.format(k, ok, tok)); + toast.ok(t, (sr ? L.ur_aso : L.ur_auo).format(ok)); else if (ok) - toast.ok(t, '{0} {1}'.format(ks, tok)); + toast.ok(t, sr ? L.ur_1so : L.ur_1uo); else if (ng > 1) - toast.err(t, 'All {1} {0} {2}'.format(k, ng, tng)); + toast.err(t, (sr ? L.ur_asn : L.ur_aun).format(ng)); else if (ng) - toast.err(t, '{0} {1}'.format(ks, tng)); + toast.err(t, sr ? L.ur_1sn : L.ur_1un); timer.rm(etafun); timer.rm(donut.do);