From 501db916a46b9937d62d35023c2471eba926be3f Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Oct 24 2018 21:30:14 +0000 Subject: Fix #58 - Display max size on upload page --- diff --git a/CHANGELOG b/CHANGELOG index bbfc95b..1ca460c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ Revision history for Lufi - Add a command to migrate data from SQLite to an other database - Add a test suite - MySQL support + - Display max size on upload page 0.02.2 2017-09-18 - Fix cron tasks bug diff --git a/themes/default/lib/Lufi/I18N/ca.po b/themes/default/lib/Lufi/I18N/ca.po index 3cfb7cd..4221de6 100644 --- a/themes/default/lib/Lufi/I18N/ca.po +++ b/themes/default/lib/Lufi/I18N/ca.po @@ -24,6 +24,10 @@ msgstr "" msgid "%1 days" msgstr "%1 dies" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "1 any" @@ -73,7 +77,7 @@ msgstr "Mal testimoni CSRF!" msgid "Click here to refresh the page and restart the download." msgstr "Premeu aquí per tal de refrescar la pàgina i reiniciar la descàrrega" -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "Premeu per obrir la selecció de fitxer." @@ -291,7 +295,7 @@ msgstr "Els meus fitxers" msgid "No enough space available on the server for this file (size: %1)." msgstr "No hi ha prou espai al servidor per a aquest fitxer (mida: %1)" -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "Sense moratòria d'expiració" @@ -344,7 +348,7 @@ msgstr "Envia amb aquest servidor" msgid "Send with your own mail software" msgstr "Envia amb el vostre propi programa de correu" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "S'està enviant el tros XX1 de XX2. Si us plau, paciència; la barra de progrés pot trigar una mica a bellugar-se. " @@ -447,11 +451,11 @@ msgstr "Pujar fitxers" msgid "Uploaded at" msgstr "Pujat a les" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "Fitxers pujats" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "Error de comunicacions del websocket" @@ -532,6 +536,6 @@ msgstr "a partir de %1, el fitxer es mantindrà per sempre al servidor." msgid "no time limit" msgstr "no hi ha límit de temps" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "o" diff --git a/themes/default/lib/Lufi/I18N/en.po b/themes/default/lib/Lufi/I18N/en.po index 0ddf8e1..2677387 100644 --- a/themes/default/lib/Lufi/I18N/en.po +++ b/themes/default/lib/Lufi/I18N/en.po @@ -21,6 +21,10 @@ msgstr "" msgid "%1 days" msgstr "%1 days" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "" @@ -70,7 +74,7 @@ msgstr "" msgid "Click here to refresh the page and restart the download." msgstr "" -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "" @@ -287,7 +291,7 @@ msgstr "" msgid "No enough space available on the server for this file (size: %1)." msgstr "" -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "" @@ -340,7 +344,7 @@ msgstr "" msgid "Send with your own mail software" msgstr "" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "" @@ -441,11 +445,11 @@ msgstr "" msgid "Uploaded at" msgstr "" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "" @@ -526,6 +530,6 @@ msgstr "" msgid "no time limit" msgstr "" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "" diff --git a/themes/default/lib/Lufi/I18N/fr.po b/themes/default/lib/Lufi/I18N/fr.po index 445b88e..2616885 100644 --- a/themes/default/lib/Lufi/I18N/fr.po +++ b/themes/default/lib/Lufi/I18N/fr.po @@ -23,6 +23,10 @@ msgstr "" msgid "%1 days" msgstr "%1 jours" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "(taille max: XXX)" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "1 an" @@ -72,7 +76,7 @@ msgstr "Mauvais jeton CSRF !" msgid "Click here to refresh the page and restart the download." msgstr "Cliquez ici pour rafraîchir la page et redémarrer le téléchargement." -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "Cliquez pour ouvrir le navigateur de fichiers" @@ -289,7 +293,7 @@ msgstr "Mes fichiers" msgid "No enough space available on the server for this file (size: %1)." msgstr "Espace disque insuffisant sur le serveur pour ce fichier (taille du fichier : %1)." -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "Pas de délai d’expiration" @@ -342,7 +346,7 @@ msgstr "Envoyer avec ce serveur" msgid "Send with your own mail software" msgstr "Envoyer avec votre propre logiciel de mail" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "Envoi du fragment XX1 sur XX2. Veuillez patienter, la barre de progression peut mettre du temps avant d’avancer." @@ -447,11 +451,11 @@ msgstr "Envoyer des fichiers" msgid "Uploaded at" msgstr "Envoyé le" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "Fichiers envoyés" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "Erreur de communication WebSocket" @@ -532,6 +536,6 @@ msgstr "pour %1 et plus, le fichier sera conservé indéfiniment." msgid "no time limit" msgstr "Pas de délai d’expiration" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "ou" diff --git a/themes/default/lib/Lufi/I18N/it.po b/themes/default/lib/Lufi/I18N/it.po index 86d929e..1d32a15 100644 --- a/themes/default/lib/Lufi/I18N/it.po +++ b/themes/default/lib/Lufi/I18N/it.po @@ -23,6 +23,10 @@ msgstr "" msgid "%1 days" msgstr "%1 giorni" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "1 anno" @@ -72,7 +76,7 @@ msgstr "Token CSRF errato!" msgid "Click here to refresh the page and restart the download." msgstr "Click qui per aggiornare la pagina e ricominciare il download." -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "Click per aprire il file browser" @@ -289,7 +293,7 @@ msgstr "I miei file" msgid "No enough space available on the server for this file (size: %1)." msgstr "Spazio disco insufficiente sul server per questo file (dimensione: %1)." -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "Nessun ritardo per la scadenza" @@ -346,7 +350,7 @@ msgstr "Inviare tramite questo server" msgid "Send with your own mail software" msgstr "Inviare tramite il vostro programma di posta" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "Invio della parte XX1 su XX2. Prego attendere, la barra di avanzamento può impiegare del tempo prima di colorarsi." @@ -451,11 +455,11 @@ msgstr "Invio dei file" msgid "Uploaded at" msgstr "Invio il" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "File inviati" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "Errore di comunicazione WebSocket" @@ -536,6 +540,6 @@ msgstr "per %1 e più, il file sarà conservato per sempre." msgid "no time limit" msgstr "nessuna limitazione temporale" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "o" diff --git a/themes/default/lib/Lufi/I18N/nl.po b/themes/default/lib/Lufi/I18N/nl.po index 1e4aee2..6809861 100644 --- a/themes/default/lib/Lufi/I18N/nl.po +++ b/themes/default/lib/Lufi/I18N/nl.po @@ -10,6 +10,10 @@ msgid "%1 days" msgstr "%1 dagen" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "1 jaar" @@ -59,7 +63,7 @@ msgstr "Verkeerde CSRF token!" msgid "Click here to refresh the page and restart the download." msgstr "Klik hier om de pagina te verversen en opnieuw te downloaden." -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "Klik voor bestandbrowser" @@ -276,7 +280,7 @@ msgstr "Mijn bestanden" msgid "No enough space available on the server for this file (size: %1)." msgstr "Geen genoeg ruimte op de server voor deze bestand (grootte: %1)." -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "Geen verloop uitstel" @@ -333,7 +337,7 @@ msgstr "Verstuur via deze server" msgid "Send with your own mail software" msgstr "Verstuur via eigen mail software" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "Versturen deel XX1 van XX2. Een ogenblik geduld..." @@ -434,11 +438,11 @@ msgstr "Upload bestanden" msgid "Uploaded at" msgstr "Geupload op" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "Geuploade bestanden" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "Websocket communicatie fout" @@ -551,6 +555,6 @@ msgstr "voor %1 en meer, bestand zal voor altijd bewaard worden." msgid "no time limit" msgstr "geen tijdslimiet" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "of" diff --git a/themes/default/lib/Lufi/I18N/oc.po b/themes/default/lib/Lufi/I18N/oc.po index 6ba03ef..f218c7a 100644 --- a/themes/default/lib/Lufi/I18N/oc.po +++ b/themes/default/lib/Lufi/I18N/oc.po @@ -23,6 +23,10 @@ msgstr "" msgid "%1 days" msgstr "%1 jorns" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "1 an" @@ -72,7 +76,7 @@ msgstr "Marrit geton CSRF !" msgid "Click here to refresh the page and restart the download." msgstr "Clicatz aquí per actualizar la pagina e tornar començar lo telecargament." -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "Clicatz per dobrir lo navigator de fichièr" @@ -289,7 +293,7 @@ msgstr "Mos fichièrs" msgid "No enough space available on the server for this file (size: %1)." msgstr "Espaci disc insufisent sul servidor per aqueste fichièr (talha del fichièr : \"%1)." -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "Pas cap de relambi d’expiracion" @@ -346,7 +350,7 @@ msgstr "Mandar amb aqueste servidor" msgid "Send with your own mail software" msgstr "Mandar amb vòstre pròpri logicial de corrièl" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "Mandadís del fragment XX1 sus XX2. Pacientatz, la barra de progression pòt metre de temps abans d’avançar." @@ -451,11 +455,11 @@ msgstr "Mandar de fichièrs" msgid "Uploaded at" msgstr "Mandat lo" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "Fichièrs mandats" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "Error de comunicacion WebSocket" @@ -536,6 +540,6 @@ msgstr "per %1 e mai, lo fichièr serà gardat per totjorn." msgid "no time limit" msgstr "Pas cap de relambi d’expiracion" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "o" diff --git a/themes/default/lib/Lufi/I18N/pt.po b/themes/default/lib/Lufi/I18N/pt.po index 1d6de8c..bd3a59f 100644 --- a/themes/default/lib/Lufi/I18N/pt.po +++ b/themes/default/lib/Lufi/I18N/pt.po @@ -24,6 +24,10 @@ msgstr "" msgid "%1 days" msgstr "%1 dias" +#: themes/default/templates/partial/index.js.ep:26 +msgid "(max size: XXX)" +msgstr "" + #: themes/default/templates/index.html.ep:5 msgid "1 year" msgstr "1 ano" @@ -73,7 +77,7 @@ msgstr "Símbolo errado CSRF !" msgid "Click here to refresh the page and restart the download." msgstr "Clique aqui para atualizar a página e começar o download." -#: themes/default/templates/index.html.ep:97 +#: themes/default/templates/index.html.ep:98 msgid "Click to open the file browser" msgstr "Clique para abrir o navegador de ficheiros" @@ -298,7 +302,7 @@ msgstr "Meus ficheiros" msgid "No enough space available on the server for this file (size: %1)." msgstr "O servidor não tem espaço suficiente para este ficheiro (tamanho: %1)." -#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:27 msgid "No expiration delay" msgstr "Não tem prazo de expiração" @@ -351,7 +355,7 @@ msgstr "Enviar com este servidor" msgid "Send with your own mail software" msgstr "Enviar com o seu e-mail pessoal" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "Envio do fragmento XX1 de XX2. Por favor aguarde, a barra de progressão pode levar algum tempo antes de avançar." @@ -452,11 +456,11 @@ msgstr "Enviar os ficheiros" msgid "Uploaded at" msgstr "Enviar a" -#: themes/default/templates/index.html.ep:102 +#: themes/default/templates/index.html.ep:103 msgid "Uploaded files" msgstr "Ficheiros enviados" -#: themes/default/templates/partial/index.js.ep:28 +#: themes/default/templates/partial/index.js.ep:29 msgid "Websocket communication error" msgstr "Erro de comunicação com WebSocket" @@ -541,6 +545,6 @@ msgstr "para %1 e mais, o ficheiro será conservado por um tempo indeterminado." msgid "no time limit" msgstr "Não tem limite de expiração" -#: themes/default/templates/index.html.ep:95 +#: themes/default/templates/index.html.ep:96 msgid "or" msgstr "ou" diff --git a/themes/default/public/js/lufi-up.js b/themes/default/public/js/lufi-up.js index 33dadd7..0728ebf 100644 --- a/themes/default/public/js/lufi-up.js +++ b/themes/default/public/js/lufi-up.js @@ -456,6 +456,9 @@ $(document).ready(function(){ } else { bindDropZone(); } + if (maxSize > 0) { + $('#max-file-size').text(i18n.maxSize.replace('XXX', filesize(maxSize))); + } $('label[for="first-view"]').on('click', function(){ if ($('#first-view').attr('data-checked') && $('#first-view').attr('data-checked') === 'data-checked') { $('#first-view').attr('data-checked', null); diff --git a/themes/default/templates/index.html.ep b/themes/default/templates/index.html.ep index d19fb0e..ccb4a7a 100644 --- a/themes/default/templates/index.html.ep +++ b/themes/default/templates/index.html.ep @@ -92,6 +92,7 @@

<%= l('Drop files here') %>

+

<%= l('or') %>