From 7aae44f6cc7c5ea16d4cceecc2cb3b1970c224ac Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Mon, 11 Sep 2017 21:30:45 +0200 Subject: [PATCH] Fix #64 --- lib/Lufi/Controller/Mail.pm | 3 ++- themes/default/lib/Lufi/I18N/ca.po | 12 ++++++------ themes/default/lib/Lufi/I18N/en.po | 12 ++++++------ themes/default/lib/Lufi/I18N/fr.po | 12 ++++++------ themes/default/lib/Lufi/I18N/it.po | 12 ++++++------ themes/default/lib/Lufi/I18N/nl.po | 12 ++++++------ themes/default/lib/Lufi/I18N/oc.po | 12 ++++++------ themes/default/lib/Lufi/I18N/pt.po | 12 ++++++------ 8 files changed, 44 insertions(+), 43 deletions(-) diff --git a/lib/Lufi/Controller/Mail.pm b/lib/Lufi/Controller/Mail.pm index b004919..bbfbfbe 100644 --- a/lib/Lufi/Controller/Mail.pm +++ b/lib/Lufi/Controller/Mail.pm @@ -6,10 +6,11 @@ use Mojo::JSON qw(decode_json); sub render_mail { my $c = shift; + my $links = (defined($c->param('links'))) ? decode_json($c->param('links')) : []; $c->render( template => 'mail', - links => decode_json($c->param('links')) + links => $links ); } diff --git a/themes/default/lib/Lufi/I18N/ca.po b/themes/default/lib/Lufi/I18N/ca.po index 3f70ffb..9982b56 100644 --- a/themes/default/lib/Lufi/I18N/ca.po +++ b/themes/default/lib/Lufi/I18N/ca.po @@ -65,7 +65,7 @@ msgstr "Demanem la part XX1 de %1 del fitxer" msgid "Back to homepage" msgstr "Retorna a la pàgina d'inici" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "Mal testimoni CSRF!" @@ -363,11 +363,11 @@ msgstr "" msgid "The data has been successfully imported." msgstr "La importació de les dades ha reeixit." -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "El cos del correu no pot estar buit." -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "L'assumpte dle correu no pot estar buit." @@ -380,7 +380,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "Els fitxers que es pugen a una instaŀlació de Lufi són xifrats abans de pujar-los al servidor i l'administrador del servidor no pot veure el contingut del fitxer." #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "Les següents adreces de correu electrònic no són vàlides: %1" @@ -388,7 +388,7 @@ msgstr "Les següents adreces de correu electrònic no són vàlides: %1" msgid "The link(s) has been copied to your clipboard" msgstr "L'enllaç/ els enllaços ja estan copiats al portaretalls" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "El correu ja està enviat." @@ -471,7 +471,7 @@ msgstr "Heu intentat deixar aquesta pàgina. Es canceŀlarà la pujada. N'esteu msgid "You have been successfully logged out." msgstr "Heu sortit correctament." -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "Heu de donar l'adreça de correu electrònic." diff --git a/themes/default/lib/Lufi/I18N/en.po b/themes/default/lib/Lufi/I18N/en.po index e65ba46..72cfd26 100644 --- a/themes/default/lib/Lufi/I18N/en.po +++ b/themes/default/lib/Lufi/I18N/en.po @@ -62,7 +62,7 @@ msgstr "" msgid "Back to homepage" msgstr "" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "" @@ -357,11 +357,11 @@ msgstr "" msgid "The data has been successfully imported." msgstr "" -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "" -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "" @@ -374,7 +374,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "" #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "" @@ -382,7 +382,7 @@ msgstr "" msgid "The link(s) has been copied to your clipboard" msgstr "" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "" @@ -465,7 +465,7 @@ msgstr "" msgid "You have been successfully logged out." msgstr "" -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/fr.po b/themes/default/lib/Lufi/I18N/fr.po index 9d08f51..7009b61 100644 --- a/themes/default/lib/Lufi/I18N/fr.po +++ b/themes/default/lib/Lufi/I18N/fr.po @@ -64,7 +64,7 @@ msgstr "Demande de récupération du fragment de fichier XX1 sur %1" msgid "Back to homepage" msgstr "Retour à la page d’accueil" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "Mauvais jeton CSRF !" @@ -359,11 +359,11 @@ msgstr "L’administrateur ne peut voir que le nom du fichier, sa taille et son msgid "The data has been successfully imported." msgstr "Les données ont été importées avec succès." -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "Le corps du mail ne peut être vide." -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "Le sujet du mail ne peut être vide." @@ -376,7 +376,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "Les fichiers envoyés sur une instance de Lufi sont chiffrés avant l’envoi au serveur : l’administrateur du serveur ne peut pas voir le contenu de vos fichiers." #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "Les adresses mail suivantes ne sont pas valides : %1" @@ -384,7 +384,7 @@ msgstr "Les adresses mail suivantes ne sont pas valides : %1" msgid "The link(s) has been copied to your clipboard" msgstr "Le(s) lien(s) a/ont été copié dans votre presse-papier" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "Le mail a été envoyé." @@ -467,7 +467,7 @@ msgstr "Vous essayez de quitter la page. L’envoi sera annulé. Êtes-vous sûr msgid "You have been successfully logged out." msgstr "Vous avez été déconnecté·e avec succès." -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "Vous devez envoyer des adresses mail." diff --git a/themes/default/lib/Lufi/I18N/it.po b/themes/default/lib/Lufi/I18N/it.po index c1633f8..c85af03 100644 --- a/themes/default/lib/Lufi/I18N/it.po +++ b/themes/default/lib/Lufi/I18N/it.po @@ -64,7 +64,7 @@ msgstr "Recupero della porzione del file XX1 su %1" msgid "Back to homepage" msgstr "Ritorna all'homepage" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "Token CSRF errato!" @@ -367,11 +367,11 @@ msgstr "" msgid "The data has been successfully imported." msgstr "I dati sono stati importati correttamente." -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "Il corpo dell'email non può essere vuoto." -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "Il soggetto dell'email non può essere vuoto." @@ -384,7 +384,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "I file inviati su un istanza di Lufi sono cifrati prima dell'invio al server: l'amministratore del server non può vedere il contenuto dei vostri file." #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "I seguenti indirizzi email non sono validi: %1" @@ -392,7 +392,7 @@ msgstr "I seguenti indirizzi email non sono validi: %1" msgid "The link(s) has been copied to your clipboard" msgstr "I link sono stati copiati negli appunti" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "Email inviata." @@ -475,7 +475,7 @@ msgstr "Hai cercato di uscire da questa pagina. L'invio sarà cancellato. Sei si msgid "You have been successfully logged out." msgstr "Logout avvenuto con successo." -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "Devi fornire gli indirizzi email." diff --git a/themes/default/lib/Lufi/I18N/nl.po b/themes/default/lib/Lufi/I18N/nl.po index adcd591..fdd11e9 100644 --- a/themes/default/lib/Lufi/I18N/nl.po +++ b/themes/default/lib/Lufi/I18N/nl.po @@ -51,7 +51,7 @@ msgstr "Deel XX1 van %1 wordt opgehaald" msgid "Back to homepage" msgstr "Terug naar home" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "Verkeerde CSRF token!" @@ -350,11 +350,11 @@ msgstr "Beheerders zien alleen bestandsnamen, grootte en mimetype (wat voor soor msgid "The data has been successfully imported." msgstr "Data is succesvol geimporteerd." -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "Mail inhoud kan niet leeg zijn." -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "Onderwerp kan niet leeg zijn." @@ -367,7 +367,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "Bestanden die geupload zijn naar Lufi worden voor de upload versleuteld: beheerders van de server kunnen de inhoud van het bestand niet zien." #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "Volgende email adressen zijn niet geldig: %1" @@ -375,7 +375,7 @@ msgstr "Volgende email adressen zijn niet geldig: %1" msgid "The link(s) has been copied to your clipboard" msgstr "De link is gekopieerd naar je klembord" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "Email is verzonden." @@ -458,7 +458,7 @@ msgstr "Je verlaat deze pagina. Upload zal geannuleerd worden. Weet je het zeker msgid "You have been successfully logged out." msgstr "Je bent succesvol uitgelogd." -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "Je moet een mail adres opgeven." diff --git a/themes/default/lib/Lufi/I18N/oc.po b/themes/default/lib/Lufi/I18N/oc.po index dbed4b6..95ccf09 100644 --- a/themes/default/lib/Lufi/I18N/oc.po +++ b/themes/default/lib/Lufi/I18N/oc.po @@ -64,7 +64,7 @@ msgstr "Demanda del tròç XX1 sus %1 del fichièr" msgid "Back to homepage" msgstr "Retorn a la pagina d’acuèlh" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "Marrit geton CSRF !" @@ -359,11 +359,11 @@ msgstr "L’administrator pòt pas que veire lo nom del fichièr, sa talha e son msgid "The data has been successfully imported." msgstr "Las donadas son ben estadas importadas." -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "Lo contengut del corrièl pòt pas èsser void." -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "Lo sujècte del corrièl pòt pas èsser void." @@ -376,7 +376,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "Los fichièrs mandats amb una instància Lufi son chifrats abans la mandadís al servidor : l’administrator del servidor pòt pas veire lo contengut dels fichièrs." #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "Las adreças de corrièl seguentas son pas validas : %1" @@ -384,7 +384,7 @@ msgstr "Las adreças de corrièl seguentas son pas validas : %1" msgid "The link(s) has been copied to your clipboard" msgstr "Lo(s) ligam(s) es/son estat(s) copiat(s) dins vòstre quichapapièrs" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "Lo corrièl es estat mandat." @@ -467,7 +467,7 @@ msgstr "Ensajatz de partir de la pagina. Lo mandadís serà anullat. Sètz segur msgid "You have been successfully logged out." msgstr "Sètz ben estat desconnectat." -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "Vos cal donar d’adreças." diff --git a/themes/default/lib/Lufi/I18N/pt.po b/themes/default/lib/Lufi/I18N/pt.po index 3c6fdce..0cc7321 100644 --- a/themes/default/lib/Lufi/I18N/pt.po +++ b/themes/default/lib/Lufi/I18N/pt.po @@ -65,7 +65,7 @@ msgstr "Pedido de recuperação de um fragmento do ficheiro XX1 de %1" msgid "Back to homepage" msgstr "Voltar à página inicial" -#: lib/Lufi/Controller/Mail.pm:20 +#: lib/Lufi/Controller/Mail.pm:21 msgid "Bad CSRF token!" msgstr "Símbolo errado CSRF !" @@ -368,11 +368,11 @@ msgstr "O administrador pode apenas ver o nome do ficheiro, o seu tamanho e o ti msgid "The data has been successfully imported." msgstr "Os dados foram importados com sucesso." -#: lib/Lufi/Controller/Mail.pm:42 +#: lib/Lufi/Controller/Mail.pm:43 msgid "The email body can't be empty." msgstr "A mensagem do e-mail não pode estar vazia." -#: lib/Lufi/Controller/Mail.pm:41 +#: lib/Lufi/Controller/Mail.pm:42 msgid "The email subject can't be empty." msgstr "O assunto do e-mail não pode estar vazio." @@ -385,7 +385,7 @@ msgid "The files uploaded on a Lufi instance are encrypted before the upload to msgstr "Os ficheiros enviados no Lufi são codificados antes de serem enviados ao servidor: o administrador do servidor não pode ver o conteúdo dos ficheiros." #. (join(', ', @bad) -#: lib/Lufi/Controller/Mail.pm:37 +#: lib/Lufi/Controller/Mail.pm:38 msgid "The following email addresses are not valid: %1" msgstr "Os e-mails seguintes não são válidos: %1" @@ -393,7 +393,7 @@ msgstr "Os e-mails seguintes não são válidos: %1" msgid "The link(s) has been copied to your clipboard" msgstr "O(s) link(s) foi/foram copiados para a área de transferência" -#: lib/Lufi/Controller/Mail.pm:65 +#: lib/Lufi/Controller/Mail.pm:66 msgid "The mail has been sent." msgstr "O e-mail foi enviado." @@ -480,7 +480,7 @@ msgstr "Está a tentar sair da página. O envio será anulado. Tem a certeza?" msgid "You have been successfully logged out." msgstr "Foi desconectado com sucesso." -#: lib/Lufi/Controller/Mail.pm:40 +#: lib/Lufi/Controller/Mail.pm:41 msgid "You must give email addresses." msgstr "Deve escrever os e-mails."