From 1b3502a18997c931bec3c36b140a775ad391e410 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 7 Nov 2019 09:55:10 +0100 Subject: [PATCH 01/17] =?UTF-8?q?=F0=9F=94=96=20=E2=80=94=20Bump=20version?= =?UTF-8?q?=20(0.04.6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 64202de..72ef946 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Revision history for Lufi ?.??.? ????-??-?? + +0.04.6 2019-11-07 - Now can send large files (>2Gio) while using a DB other than SQLite (#165) - Use customized instance name in From 0ab2bcc5a891e295bbbcc4516d6e19a7b63258e6 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:34:20 +0000 Subject: [PATCH 02/17] Translated using Weblate (Arabic) Currently translated at 84.5% (158 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/ar/ --- themes/default/lib/Lufi/I18N/ar.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/ar.po b/themes/default/lib/Lufi/I18N/ar.po index da590fc..a49e52b 100644 --- a/themes/default/lib/Lufi/I18N/ar.po +++ b/themes/default/lib/Lufi/I18N/ar.po @@ -5,16 +5,17 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: Arabic <https://weblate.framasoft.org/projects/lufi/" +"development/ar/>\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-08-09 08:47+0000\n" -"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" -"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Zanata 4.6.2\n" -"Language-Team: Arabic\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -101,7 +102,7 @@ msgstr "" #. (stash('nbslices') #: themes/default/templates/partial/render.js.ep:9 msgid "Asking for file part XX1 of %1" -msgstr "طلب الجزء XX1 مِن %1 " +msgstr "طلب الجزء XX1 مِن %1" #: themes/default/templates/about.html.ep:20 msgid "Back to homepage" @@ -137,7 +138,7 @@ msgstr "عناوين البريد الإلكترونية مُقسّمة بفاص #: themes/default/templates/index.html.ep:140 msgid "Compressing zip file…" -msgstr "جارٍ ضغط ملف zip..." +msgstr "جارٍ ضغط ملف zip…" #: themes/default/templates/partial/index.js.ep:15 msgid "Copy all links to clipboard" @@ -213,6 +214,9 @@ msgid "" "people you want to share the file with and a deletion link, allowing you to " "delete the file whenever you want." msgstr "" +"اسحب الملفات إلى الحقل المخصص لذلك أو حدد ملفًا بطريقة كلاسيكية وسيتم قص " +"الملفات إلى أجزاء مشفرة وإرسالها إلى الخادم. ستحصل على روابط لكل ملف: رابط " +"للتنزيل ورابط لحذف الملف عند الحاجة لذلك." #: themes/default/templates/index.html.ep:122 msgid "Drop files here" @@ -264,7 +268,7 @@ msgstr "تنتهي صلاحيته في" #: themes/default/templates/files.html.ep:12 msgid "Export localStorage data" -msgstr "" +msgstr "تصدير بيانات localStorage" #: lib/Lufi/Controller/Files.pm:471 msgid "File deleted" @@ -364,7 +368,7 @@ msgstr "" #: themes/default/templates/files.html.ep:14 msgid "Import localStorage data" -msgstr "" +msgstr "استيراد بيانات localStorage" #: themes/default/templates/index.html.ep:53 msgid "Important: more information on delays" @@ -851,7 +855,7 @@ msgstr "الكلمة السرية غير صالحة. يرجى تحديث الص #: themes/default/templates/partial/render.js.ep:12 msgid "Zip content:" -msgstr "" +msgstr "محتوى ملف Zip المضغوط:" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:20 From 14bf51e910d989b3925f9de50aed08fd0745c40a Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:45:32 +0000 Subject: [PATCH 03/17] Translated using Weblate (Catalan) Currently translated at 67.4% (126 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/ca/ --- themes/default/lib/Lufi/I18N/ca.po | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/ca.po b/themes/default/lib/Lufi/I18N/ca.po index 2e2406a..95f3347 100644 --- a/themes/default/lib/Lufi/I18N/ca.po +++ b/themes/default/lib/Lufi/I18N/ca.po @@ -10,15 +10,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: Catalan <https://weblate.framasoft.org/projects/lufi/" +"development/ca/>\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-04-19 04:55+0000\n" -"Last-Translator: Luc Didry <luc@framasoft.org>\n" -"Language-Team: català; valencià <>\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 4.6.2\n" -"Language: ca\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -230,7 +231,7 @@ msgstr "" "servidor. Obtindreu dos enllaços per a cada fitxer: un enllaç per a la " "descàrrega, que doneu a la gent amb qui voleu compartir el fitxer, i un " "enllaç per a l'eliminació, que us permet eliminar el fitxer del servidor " -"quan vulgueu. " +"quan vulgueu." #: themes/default/templates/index.html.ep:122 msgid "Drop files here" @@ -337,7 +338,10 @@ msgstr "" #: themes/default/templates/partial/mail.js.ep:35 msgid "Hello,\\n\\nHere's some files I want to share with you:\\n" -msgstr "Hola,\\n\\nVe't aquí uns fitxers que vull compartir amb tu:" +msgstr "" +"Hola,\\n" +"\\n" +"Ve't aquí uns fitxers que vull compartir amb tu:\\n" #: themes/default/templates/mail.html.ep:35 msgid "Here's some files" @@ -569,7 +573,7 @@ msgid "" "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. " +"progrés pot trigar una mica a bellugar-se." #. (url_for('/') #: themes/default/templates/partial/mail.js.ep:48 @@ -910,7 +914,7 @@ msgstr "entre %1 i %2, el fitxer es mantindrà per sempre al servidor." #: themes/default/templates/partial/mail.js.ep:42 msgid "deadline: " -msgstr "termini:" +msgstr "termini: " #: themes/default/templates/partial/invitations.js.ep:5 msgid "expires on XXX" @@ -919,7 +923,7 @@ msgstr "" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:26 msgid "for %1 and more, the file will be kept %2 day(s)" -msgstr "a partir de %1, el fitxer es mantindrà %2 dia/es al servidor " +msgstr "a partir de %1, el fitxer es mantindrà %2 dia/es al servidor" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:28 From 575456215641a4ba9fe7d5f28ef56bf7d6646d4a Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:46:48 +0000 Subject: [PATCH 04/17] Translated using Weblate (German) Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/de/ --- themes/default/lib/Lufi/I18N/de.po | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/de.po b/themes/default/lib/Lufi/I18N/de.po index 7b3d6a1..db372f4 100644 --- a/themes/default/lib/Lufi/I18N/de.po +++ b/themes/default/lib/Lufi/I18N/de.po @@ -5,15 +5,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: German <https://weblate.framasoft.org/projects/lufi/" +"development/de/>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-08-14 04:09+0000\n" -"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" -"Language-Team: German\n" -"Language: de\n" -"X-Generator: Zanata 4.6.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -149,7 +150,7 @@ msgstr "Kommagetrennte E-Mail-Adressen" #: themes/default/templates/index.html.ep:140 msgid "Compressing zip file…" -msgstr "Komprimierung der Zip-Datei..." +msgstr "Komprimierung der Zip-Datei…" #: themes/default/templates/partial/index.js.ep:15 msgid "Copy all links to clipboard" @@ -457,10 +458,13 @@ msgid "" "is the only time that we will ask you this." msgstr "" "Die Art und Weise wie Lufi Datei-Informationen speichert, wurde kürzlich " -"geändert.\\n\\n Am neuen localStorage-Speicherort konnten keine Dateien " -"gefunden werden, allerdings wurden Dateien am alten Speicherort gefunden." -"\\nWollen Sie diese Informationen importieren?\\nBitte beachten Sie, dass " -"diese Meldung nur ein einziges Mal angezeigt wird." +"geändert.\\n" +"\\n" +"Am neuen localStorage-Speicherort konnten keine Dateien gefunden werden, " +"allerdings wurden Dateien am alten Speicherort gefunden.\\n" +"Wollen Sie diese Informationen importieren?\\n" +"\\n" +"Bitte beachten Sie, dass diese Meldung nur ein einziges Mal angezeigt wird." #: themes/default/templates/files.html.ep:34 msgid "Mail" @@ -947,7 +951,7 @@ msgstr "zwischen %1 und %2, wird die Datei für immer aufbewahrt." #: themes/default/templates/partial/mail.js.ep:42 msgid "deadline: " -msgstr "Frist:" +msgstr "Frist: " #: themes/default/templates/partial/invitations.js.ep:5 msgid "expires on XXX" From e4ab0ec30653861fe9dff73cba31bb7e626ca76e Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:48:11 +0000 Subject: [PATCH 05/17] Translated using Weblate (French) Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/fr/ --- themes/default/lib/Lufi/I18N/fr.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/fr.po b/themes/default/lib/Lufi/I18N/fr.po index 32f2d43..2f7fb81 100644 --- a/themes/default/lib/Lufi/I18N/fr.po +++ b/themes/default/lib/Lufi/I18N/fr.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: French <https://weblate.framasoft.org/projects/lufi/" +"development/fr/>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-10-10 08:58+0000\n" -"Language-Team: \n" -"X-Generator: Zanata 4.6.2\n" -"Last-Translator: Luc Didry <luc@framasoft.org>\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -50,7 +51,7 @@ msgstr "%A %d %B %Y à %T" #: themes/default/templates/partial/index.js.ep:27 msgid "(max size: XXX)" -msgstr "(taille max: XXX)" +msgstr "(taille max : XXX)" #: themes/default/templates/index.html.ep:5 msgid "1 year" @@ -184,7 +185,7 @@ msgstr "Créer une archive zip avec les fichiers avant l’envoi ?" #: themes/default/templates/invitations/my_invitations.html.ep:26 msgid "Created at" -msgstr "Créée le " +msgstr "Créée le" #: themes/default/templates/invitations/my_invitations.html.ep:14 msgid "Delete" @@ -938,12 +939,12 @@ msgstr "Contenu de l’archive zip :" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:20 msgid "between %1 and %2, the file will be kept %3 day(s)." -msgstr "entre %1 et %2, le fichier sera conservé %3 jour(s) ;" +msgstr "entre %1 et %2, le fichier sera conservé %3 jour(s)." #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:22 msgid "between %1 and %2, the file will be kept forever." -msgstr "entre %1 et %2, le fichier sera conservé indéfiniment ;" +msgstr "entre %1 et %2, le fichier sera conservé indéfiniment." #: themes/default/templates/partial/mail.js.ep:42 msgid "deadline: " From 42458468a690376cffab0523eea3afea3ddb07d8 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:47:51 +0000 Subject: [PATCH 06/17] Translated using Weblate (French (France)) Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/fr_FR/ --- themes/default/lib/Lufi/I18N/fr_FR.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/fr_FR.po b/themes/default/lib/Lufi/I18N/fr_FR.po index f12cdef..bac9476 100644 --- a/themes/default/lib/Lufi/I18N/fr_FR.po +++ b/themes/default/lib/Lufi/I18N/fr_FR.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: French (France) <https://weblate.framasoft.org/projects/lufi/" +"development/fr_FR/>\n" +"Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-10-10 08:58+0000\n" -"Language-Team: \n" -"X-Generator: Zanata 4.6.2\n" -"Last-Translator: Luc Didry <luc@framasoft.org>\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr_FR\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -50,7 +51,7 @@ msgstr "%A %d %B %Y à %T" #: themes/default/templates/partial/index.js.ep:27 msgid "(max size: XXX)" -msgstr "(taille max: XXX)" +msgstr "(taille max : XXX)" #: themes/default/templates/index.html.ep:5 msgid "1 year" @@ -184,7 +185,7 @@ msgstr "Créer une archive zip avec les fichiers avant l’envoi ?" #: themes/default/templates/invitations/my_invitations.html.ep:26 msgid "Created at" -msgstr "Créée le " +msgstr "Créée le" #: themes/default/templates/invitations/my_invitations.html.ep:14 msgid "Delete" @@ -938,12 +939,12 @@ msgstr "Contenu de l’archive zip :" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:20 msgid "between %1 and %2, the file will be kept %3 day(s)." -msgstr "entre %1 et %2, le fichier sera conservé %3 jour(s) ;" +msgstr "entre %1 et %2, le fichier sera conservé %3 jour(s)." #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:22 msgid "between %1 and %2, the file will be kept forever." -msgstr "entre %1 et %2, le fichier sera conservé indéfiniment ;" +msgstr "entre %1 et %2, le fichier sera conservé indéfiniment." #: themes/default/templates/partial/mail.js.ep:42 msgid "deadline: " From 291019d5e9e3a6b4b4c3c2620faf6a99792c8e22 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:44:08 +0000 Subject: [PATCH 07/17] Translated using Weblate (Italian) Currently translated at 59.4% (111 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/it/ --- themes/default/lib/Lufi/I18N/it.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/it.po b/themes/default/lib/Lufi/I18N/it.po index fe694fd..cf2e34a 100644 --- a/themes/default/lib/Lufi/I18N/it.po +++ b/themes/default/lib/Lufi/I18N/it.po @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: Italian <https://weblate.framasoft.org/projects/lufi/" +"development/it/>\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-04-19 04:58+0000\n" -"Language-Team: \n" -"X-Generator: Zanata 4.6.2\n" -"Last-Translator: Luc Didry <luc@framasoft.org>\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: it\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -428,6 +429,7 @@ msgid "Login" msgstr "Login" #: themes/default/templates/layouts/default.html.ep:58 themes/default/templates/layouts/default.html.ep:91 +#, fuzzy msgid "Logout" msgstr "Logout" @@ -883,12 +885,12 @@ msgstr "" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:20 msgid "between %1 and %2, the file will be kept %3 day(s)." -msgstr "tra %1 e %2, il file sarà conservato %3 giorno(i);" +msgstr "tra %1 e %2, il file sarà conservato %3 giorno(i)." #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:22 msgid "between %1 and %2, the file will be kept forever." -msgstr "tra %1 e %2, il file sarà conservato per sempre;" +msgstr "tra %1 e %2, il file sarà conservato per sempre." #: themes/default/templates/partial/mail.js.ep:42 msgid "deadline: " From 083c1f259c00bb7a82fe156c1605e733b0ac65a3 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:48:29 +0000 Subject: [PATCH 08/17] Translated using Weblate (Dutch) Currently translated at 61.0% (114 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/nl/ --- themes/default/lib/Lufi/I18N/nl.po | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/nl.po b/themes/default/lib/Lufi/I18N/nl.po index b52bbc2..9eb527d 100644 --- a/themes/default/lib/Lufi/I18N/nl.po +++ b/themes/default/lib/Lufi/I18N/nl.po @@ -4,15 +4,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: Dutch <https://weblate.framasoft.org/projects/lufi/" +"development/nl/>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-04-19 04:57+0000\n" -"Last-Translator: Luc Didry <luc@framasoft.org>\n" -"Language-Team: Dutch\n" -"Language: nl\n" -"X-Generator: Zanata 4.6.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -246,7 +247,7 @@ msgstr "Emails" #: themes/default/templates/partial/index.js.ep:22 msgid "Encrypting part XX1 of XX2" -msgstr "Encrypten deel XX1 van XX2 " +msgstr "Encrypten deel XX1 van XX2" #: lib/Lufi/Controller/Files.pm:289 msgid "Error: the file existed but was deleted." @@ -329,7 +330,10 @@ msgstr "" #: themes/default/templates/partial/mail.js.ep:35 msgid "Hello,\\n\\nHere's some files I want to share with you:\\n" -msgstr "Hallo,\\n\\nHier zijn enkele bestanden die ik met je wil delen:\\n\\n" +msgstr "" +"Hallo,\\n" +"\\n" +"Hier zijn enkele bestanden die ik met je wil delen:\\n" #: themes/default/templates/mail.html.ep:35 msgid "Here's some files" @@ -847,7 +851,7 @@ msgid "" "You have attempted to leave this page. The upload will be canceled. Are you " "sure?" msgstr "" -"Je verlaat deze pagina. Upload zal geannuleerd worden. Weet je het zeker? " +"Je verlaat deze pagina. Upload zal geannuleerd worden. Weet je het zeker?" #: themes/default/templates/logout.html.ep:14 msgid "You have been successfully logged out." From b48483f31e3026537e1f66b6f98a8639d166b15c Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:48:57 +0000 Subject: [PATCH 09/17] Translated using Weblate (Occitan) Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/oc/ --- themes/default/lib/Lufi/I18N/oc.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/oc.po b/themes/default/lib/Lufi/I18N/oc.po index c0904c7..0fbe55c 100644 --- a/themes/default/lib/Lufi/I18N/oc.po +++ b/themes/default/lib/Lufi/I18N/oc.po @@ -11,15 +11,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: Occitan <https://weblate.framasoft.org/projects/lufi/" +"development/oc/>\n" +"Language: oc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-10-11 05:26+0000\n" -"Last-Translator: Quentí\n" -"Language-Team: Tot en òc (totenoc.eu)\n" -"Language: oc\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Zanata 4.6.2\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -935,16 +936,16 @@ msgstr "Contengut ZIP :" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:20 msgid "between %1 and %2, the file will be kept %3 day(s)." -msgstr "entre %1 e %2, lo fichièr serà gardat %3 jorn(s) ;" +msgstr "entre %1 e %2, lo fichièr serà gardat %3 jorn(s)." #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:22 msgid "between %1 and %2, the file will be kept forever." -msgstr "entre %1 e %2, lo fichièr serà gardat per totjorn. ;" +msgstr "entre %1 e %2, lo fichièr serà gardat per totjorn." #: themes/default/templates/partial/mail.js.ep:42 msgid "deadline: " -msgstr "darrièr relambi per telecargar :" +msgstr "darrièr relambi per telecargar : " #: themes/default/templates/partial/invitations.js.ep:5 msgid "expires on XXX" From db1f1a44cc9787404de03fe1e38ef5a970e04b2a Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <butterflyoffire@protonmail.com> Date: Mon, 18 Nov 2019 09:56:09 +0000 Subject: [PATCH 10/17] Translated using Weblate (Portuguese) Currently translated at 59.4% (111 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/pt/ --- themes/default/lib/Lufi/I18N/pt.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/pt.po b/themes/default/lib/Lufi/I18N/pt.po index 63bf1dd..2dcd505 100644 --- a/themes/default/lib/Lufi/I18N/pt.po +++ b/themes/default/lib/Lufi/I18N/pt.po @@ -9,15 +9,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-11-18 10:05+0000\n" +"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"Language-Team: Portuguese <https://weblate.framasoft.org/projects/lufi/" +"development/pt/>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-04-19 04:58+0000\n" -"Language-Team: \n" -"X-Generator: Zanata 4.6.2\n" -"Last-Translator: Luc Didry <luc@framasoft.org>\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: pt\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.9.1\n" #. ($delay) #. (max_delay) @@ -894,7 +895,7 @@ msgstr "" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:20 msgid "between %1 and %2, the file will be kept %3 day(s)." -msgstr "entre %1 e %2, o ficheiro será conservado %3 dia(s) ;" +msgstr "entre %1 e %2, o ficheiro será conservado %3 dia(s)." #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:22 From 8e8fb28be69d0465c61d6a27b8cc355adc345b06 Mon Sep 17 00:00:00 2001 From: Luc Didry <luc@framasoft.org> Date: Mon, 18 Nov 2019 10:19:56 +0000 Subject: [PATCH 11/17] =?UTF-8?q?=F0=9F=8C=90=20Translated=20using=20Webla?= =?UTF-8?q?te=20(French)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/fr/ --- themes/default/lib/Lufi/I18N/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/fr.po b/themes/default/lib/Lufi/I18N/fr.po index 2f7fb81..66b5c96 100644 --- a/themes/default/lib/Lufi/I18N/fr.po +++ b/themes/default/lib/Lufi/I18N/fr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2019-11-18 10:05+0000\n" -"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"PO-Revision-Date: 2019-11-18 10:21+0000\n" +"Last-Translator: Luc Didry <luc@framasoft.org>\n" "Language-Team: French <https://weblate.framasoft.org/projects/lufi/" "development/fr/>\n" "Language: fr\n" @@ -264,11 +264,11 @@ msgstr "Chiffrement du fragment XX1 sur XX2" #: lib/Lufi/Controller/Files.pm:289 msgid "Error: the file existed but was deleted." -msgstr "Erreur : le fichier existait mais a été supprimé" +msgstr "Erreur : le fichier existait mais a été supprimé." #: lib/Lufi/Controller/Files.pm:369 msgid "Error: the file has not been sent entirely." -msgstr "Erreur : le fichier n’a pas été envoyé dans son intégralité" +msgstr "Erreur : le fichier n’a pas été envoyé dans son intégralité." #: lib/Lufi/Controller/Files.pm:379 msgid "Error: unable to find the file. Are you sure of your URL?" @@ -327,7 +327,7 @@ msgid "" msgstr "" "Récupérez le code source sur <a href=\"https://framagit.org/luc/lufi\" class=" "\"classic\">le dépôt officiel</a> ou sur son <a href=\"https://github.com/" -"ldidry/lufi\" class=\"classic\">miroir Github</a>." +"ldidry/lufi\" class=\"classic\">miroir Github</a>" #: themes/default/templates/invitations/my_invitations.html.ep:24 msgid "Guest mail" @@ -957,7 +957,7 @@ msgstr "expire le XXX" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:26 msgid "for %1 and more, the file will be kept %2 day(s)" -msgstr "pour %1 et plus, le fichier sera conservé %2 jour(s)." +msgstr "pour %1 et plus, le fichier sera conservé %2 jour(s)" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:28 From f40f921a1a31d516dc091329516c8a032e7fe12e Mon Sep 17 00:00:00 2001 From: Luc Didry <luc@framasoft.org> Date: Mon, 18 Nov 2019 10:20:23 +0000 Subject: [PATCH 12/17] =?UTF-8?q?=F0=9F=8C=90=20Translated=20using=20Webla?= =?UTF-8?q?te=20(French=20(France))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/fr_FR/ --- themes/default/lib/Lufi/I18N/fr_FR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/fr_FR.po b/themes/default/lib/Lufi/I18N/fr_FR.po index bac9476..8e2cf0b 100644 --- a/themes/default/lib/Lufi/I18N/fr_FR.po +++ b/themes/default/lib/Lufi/I18N/fr_FR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2019-11-18 10:05+0000\n" -"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"PO-Revision-Date: 2019-11-18 10:21+0000\n" +"Last-Translator: Luc Didry <luc@framasoft.org>\n" "Language-Team: French (France) <https://weblate.framasoft.org/projects/lufi/" "development/fr_FR/>\n" "Language: fr_FR\n" @@ -264,11 +264,11 @@ msgstr "Chiffrement du fragment XX1 sur XX2" #: lib/Lufi/Controller/Files.pm:289 msgid "Error: the file existed but was deleted." -msgstr "Erreur : le fichier existait mais a été supprimé" +msgstr "Erreur : le fichier existait mais a été supprimé." #: lib/Lufi/Controller/Files.pm:369 msgid "Error: the file has not been sent entirely." -msgstr "Erreur : le fichier n’a pas été envoyé dans son intégralité" +msgstr "Erreur : le fichier n’a pas été envoyé dans son intégralité." #: lib/Lufi/Controller/Files.pm:379 msgid "Error: unable to find the file. Are you sure of your URL?" @@ -327,7 +327,7 @@ msgid "" msgstr "" "Récupérez le code source sur <a href=\"https://framagit.org/luc/lufi\" class=" "\"classic\">le dépôt officiel</a> ou sur son <a href=\"https://github.com/" -"ldidry/lufi\" class=\"classic\">miroir Github</a>." +"ldidry/lufi\" class=\"classic\">miroir Github</a>" #: themes/default/templates/invitations/my_invitations.html.ep:24 msgid "Guest mail" @@ -957,7 +957,7 @@ msgstr "expire le XXX" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:26 msgid "for %1 and more, the file will be kept %2 day(s)" -msgstr "pour %1 et plus, le fichier sera conservé %2 jour(s)." +msgstr "pour %1 et plus, le fichier sera conservé %2 jour(s)" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:28 From 58a69b499114f901ab76a9625747089866b63ac5 Mon Sep 17 00:00:00 2001 From: Luc Didry <luc@framasoft.org> Date: Mon, 18 Nov 2019 10:20:49 +0000 Subject: [PATCH 13/17] =?UTF-8?q?=F0=9F=8C=90=20Translated=20using=20Webla?= =?UTF-8?q?te=20(Occitan)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/oc/ --- themes/default/lib/Lufi/I18N/oc.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/oc.po b/themes/default/lib/Lufi/I18N/oc.po index 0fbe55c..b29b278 100644 --- a/themes/default/lib/Lufi/I18N/oc.po +++ b/themes/default/lib/Lufi/I18N/oc.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2019-11-18 10:05+0000\n" -"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"PO-Revision-Date: 2019-11-18 10:21+0000\n" +"Last-Translator: Luc Didry <luc@framasoft.org>\n" "Language-Team: Occitan <https://weblate.framasoft.org/projects/lufi/" "development/oc/>\n" "Language: oc\n" @@ -36,7 +36,7 @@ msgstr "%1 vos convida a li mandar de fichièrs" #. (stash('ldap_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." -msgstr "%1 vos convida a li mandar de fichièrs per Lufi" +msgstr "%1 vos convida a li mandar de fichièrs per Lufi." #. (stash('invitation') #: themes/default/templates/invitations/notification_files_sent.mail.ep:4 @@ -265,11 +265,11 @@ msgstr "Chiframent del tròç XX1 sus XX2" #: lib/Lufi/Controller/Files.pm:289 msgid "Error: the file existed but was deleted." -msgstr "Error : lo fichièr existissiá mas es estat suprimit" +msgstr "Error : lo fichièr existissiá mas es estat suprimit." #: lib/Lufi/Controller/Files.pm:369 msgid "Error: the file has not been sent entirely." -msgstr "Error : lo fichièr es pas estat mandat completament" +msgstr "Error : lo fichièr es pas estat mandat completament." #: lib/Lufi/Controller/Files.pm:379 msgid "Error: unable to find the file. Are you sure of your URL?" @@ -327,7 +327,7 @@ msgid "" msgstr "" "Recuperatz lo còdi font sul <a href=\"https://framagit.org/luc/lufi\" class=" "\"classic\">depaus oficial</a> o sus son <a href=\"https://github.com/ldidry/" -"lufi\" class=\"classic\">miralh Github</a>." +"lufi\" class=\"classic\">miralh Github</a>" #: themes/default/templates/invitations/my_invitations.html.ep:24 msgid "Guest mail" @@ -715,7 +715,7 @@ msgstr "L’invitacion %1 es estada suprimida." #. (stash('user_mail') #: themes/default/templates/invitations/invite.html.ep:34 msgid "The invitation mail will be send from your email address (%1)." -msgstr "Lo messatge d’invitacion serà mandat a vòstra adreça electronica (%1)" +msgstr "Lo messatge d’invitacion serà mandat a vòstra adreça electronica (%1)." #: themes/default/templates/partial/index.js.ep:16 msgid "The link(s) has been copied to your clipboard" @@ -844,7 +844,7 @@ msgstr "Qual escriguèt aqueste logicial ?" #: themes/default/templates/partial/index.js.ep:13 msgid "XXX file has been added to upload queue." -msgstr "XXX fichièrs son estats ajustats a la fila de mandadís" +msgstr "XXX fichièrs son estats ajustats a la fila de mandadís." #: themes/default/templates/invitations/invite.html.ep:30 msgid "" @@ -954,7 +954,7 @@ msgstr "expira lo XXX" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:26 msgid "for %1 and more, the file will be kept %2 day(s)" -msgstr "per %1 e mai, lo fichièr serà gardat %2 jorn(s)." +msgstr "per %1 e mai, lo fichièr serà gardat %2 jorn(s)" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:28 From 524b288b9093abcccf4195f53e15787cb2b1ba19 Mon Sep 17 00:00:00 2001 From: Luc Didry <luc@framasoft.org> Date: Mon, 18 Nov 2019 10:30:54 +0000 Subject: [PATCH 14/17] =?UTF-8?q?=F0=9F=8C=90=20Translated=20using=20Webla?= =?UTF-8?q?te=20(German)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (187 of 187 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/development/de/ --- themes/default/lib/Lufi/I18N/de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/de.po b/themes/default/lib/Lufi/I18N/de.po index db372f4..0fbfc04 100644 --- a/themes/default/lib/Lufi/I18N/de.po +++ b/themes/default/lib/Lufi/I18N/de.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2019-11-18 10:05+0000\n" -"Last-Translator: ButterflyOfFire <butterflyoffire@protonmail.com>\n" +"PO-Revision-Date: 2019-11-18 10:31+0000\n" +"Last-Translator: Luc Didry <luc@framasoft.org>\n" "Language-Team: German <https://weblate.framasoft.org/projects/lufi/" "development/de/>\n" "Language: de\n" @@ -313,7 +313,7 @@ msgstr "Dateien gesendet am" #: themes/default/templates/partial/invitations.js.ep:8 msgid "Files sent in invitation XX1 by XX2" -msgstr "Dateien, die in der Einladung XX1 von XX2 gesendet wurden." +msgstr "Dateien, die in der Einladung XX1 von XX2 gesendet wurden" #: themes/default/templates/partial/render.js.ep:8 msgid "Get the file" @@ -326,8 +326,8 @@ msgid "" "com/ldidry/lufi\" class=\"classic\">Github mirror</a>" msgstr "" "Holen Sie sich den Quellcode vom <a href=\"https://framagit.org/luc/lufi\" " -"class=\"classic\">offiziellen Repository</a> oder von dessen <a href=\"https:" -"//github.com/ldidry/lufi\" class=\"classic\">Github mirror</a>." +"class=\"classic\">offiziellen Repository</a> oder von dessen <a href=\"" +"https://github.com/ldidry/lufi\" class=\"classic\">Github mirror</a>" #: themes/default/templates/invitations/my_invitations.html.ep:24 msgid "Guest mail" @@ -724,14 +724,14 @@ msgstr "Die Einladungsmail wird von Ihrer E-Mail-Adresse (%1) gesendet." #: themes/default/templates/partial/index.js.ep:16 msgid "The link(s) has been copied to your clipboard" -msgstr "Die Links wurden in die Zwischenablage kopiert." +msgstr "Die Links wurden in die Zwischenablage kopiert" #. (stash('invitation') #: themes/default/templates/index.html.ep:30 msgid "" "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "" -"Die Links Ihrer Dateien werden automatisch per E-Mail an %1 (%2) gesendet." +"Die Links Ihrer Dateien werden automatisch per E-Mail an %1 (%2) gesendet" #. (stash('ldap_user') #: themes/default/templates/invitations/invite.mail.ep:11 @@ -960,7 +960,7 @@ msgstr "Läuft ab am XXX" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:26 msgid "for %1 and more, the file will be kept %2 day(s)" -msgstr "für %1 und mehr, wird die Datei %2 Tag(e) aufbewahrt." +msgstr "für %1 und mehr, wird die Datei %2 Tag(e) aufbewahrt" #. (format_bytes($keys[$i]) #: themes/default/templates/delays.html.ep:28 From 538bf77cbecb96d6f3771ec99ccb6f34ec5ef005 Mon Sep 17 00:00:00 2001 From: Nicolas Constant <github@nicolas-constant.com> Date: Sat, 21 Mar 2020 15:23:57 -0400 Subject: [PATCH 15/17] added browser notifications --- themes/default/public/js/lufi-down.js | 1 + .../default/public/js/lufi-notifications.js | 24 +++++++++++++++++++ themes/default/public/js/lufi-up.js | 2 ++ themes/default/templates/index.html.ep | 1 + themes/default/templates/render.html.ep | 1 + 5 files changed, 29 insertions(+) create mode 100644 themes/default/public/js/lufi-notifications.js diff --git a/themes/default/public/js/lufi-down.js b/themes/default/public/js/lufi-down.js index 4108df9..1560d3e 100644 --- a/themes/default/public/js/lufi-down.js +++ b/themes/default/public/js/lufi-down.js @@ -95,6 +95,7 @@ function spawnWebsocket(pa) { if (data.part + 1 === data.total) { var blob = new Blob(a, {type: data.type}); + notify('File downloaded', data.name); $('#please-wait').remove(); $('#loading').remove(); diff --git a/themes/default/public/js/lufi-notifications.js b/themes/default/public/js/lufi-notifications.js new file mode 100644 index 0000000..7a8d221 --- /dev/null +++ b/themes/default/public/js/lufi-notifications.js @@ -0,0 +1,24 @@ +function notify(title, body) { + if (!Notification) { + return; + } + + if (Notification.permission !== "granted") { + Notification.requestPermission(); + } else { + let options = { + body: body, + icon: '/img/lufi196.png' + }; + let n = new Notification(title, options); + } +} + +document.addEventListener('DOMContentLoaded', function () { + if (!Notification) { + return; + } + + if (Notification.permission !== "granted") + Notification.requestPermission(); +}); \ No newline at end of file diff --git a/themes/default/public/js/lufi-up.js b/themes/default/public/js/lufi-up.js index e7ae260..2cb1050 100644 --- a/themes/default/public/js/lufi-up.js +++ b/themes/default/public/js/lufi-up.js @@ -477,6 +477,8 @@ function updateProgressBar(data) { console.log('Error on WebSocket connection but file has been fully send, so we don\'t care.'); } + notify('File uploaded', data.name); + $('#parts-'+window.fc).remove(); var n = $('#name-'+window.fc); var s = $('#size-'+window.fc); diff --git a/themes/default/templates/index.html.ep b/themes/default/templates/index.html.ep index 9f498c2..6409f78 100644 --- a/themes/default/templates/index.html.ep +++ b/themes/default/templates/index.html.ep @@ -165,5 +165,6 @@ %= javascript '/js/moment-with-locales.min.js' %= javascript '/js/filesize.min.js' %= javascript '/js/jszip.min.js' +%= javascript '/js/lufi-notifications.js' %= javascript '/js/lufi-up.js' % } diff --git a/themes/default/templates/render.html.ep b/themes/default/templates/render.html.ep index 4c06596..9deb809 100644 --- a/themes/default/templates/render.html.ep +++ b/themes/default/templates/render.html.ep @@ -45,6 +45,7 @@ %= javascript '/js/filesize.min.js' %= javascript '/js/sjcl.js' %= javascript '/js/jszip.min.js' +%= javascript '/js/lufi-notifications.js' %= javascript '/js/lufi-down.js' % } % } From b2c4a7f0e0e8edd4d491fa0dd9e6c1206a1065aa Mon Sep 17 00:00:00 2001 From: Nicolas Constant <github@nicolas-constant.com> Date: Sat, 21 Mar 2020 19:15:08 -0400 Subject: [PATCH 16/17] added internationalization --- themes/default/public/js/lufi-down.js | 2 +- themes/default/public/js/lufi-up.js | 2 +- themes/default/templates/partial/index.js.ep | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/themes/default/public/js/lufi-down.js b/themes/default/public/js/lufi-down.js index 1560d3e..54d0c87 100644 --- a/themes/default/public/js/lufi-down.js +++ b/themes/default/public/js/lufi-down.js @@ -95,7 +95,7 @@ function spawnWebsocket(pa) { if (data.part + 1 === data.total) { var blob = new Blob(a, {type: data.type}); - notify('File downloaded', data.name); + notify(i18n.fileDownloaded, data.name); $('#please-wait').remove(); $('#loading').remove(); diff --git a/themes/default/public/js/lufi-up.js b/themes/default/public/js/lufi-up.js index 2cb1050..8776fde 100644 --- a/themes/default/public/js/lufi-up.js +++ b/themes/default/public/js/lufi-up.js @@ -477,7 +477,7 @@ function updateProgressBar(data) { console.log('Error on WebSocket connection but file has been fully send, so we don\'t care.'); } - notify('File uploaded', data.name); + notify(i18n.fileUploaded, data.name); $('#parts-'+window.fc).remove(); var n = $('#name-'+window.fc); diff --git a/themes/default/templates/partial/index.js.ep b/themes/default/templates/partial/index.js.ep index 6fc6d76..525eecd 100644 --- a/themes/default/templates/partial/index.js.ep +++ b/themes/default/templates/partial/index.js.ep @@ -28,6 +28,8 @@ var i18n = { noLimit: '<%= l('No expiration delay') %>', sending: '<%= l('Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move.') %>', wsProblem: '<%= l('Websocket communication error') %>', + fileDownloaded: '<%= l('File downloaded') %>', + fileUploaded: '<%= l('File uploaded') %>', }; var maxSize = <%= config('max_file_size') || 0 %>; From 25cba3a8c8cea2bd75bef152ab09d467448a66b9 Mon Sep 17 00:00:00 2001 From: Luc Didry <luc@didry.org> Date: Sun, 22 Mar 2020 11:19:39 +0100 Subject: [PATCH 17/17] Small improvements to !47 (Fix #181) --- CHANGELOG | 1 + themes/default/lib/Lufi/I18N/lufi.pot | 30 +++++++++------ .../default/public/js/lufi-notifications.js | 6 ++- themes/default/templates/partial/index.js.ep | 37 +++++++++---------- themes/default/templates/partial/render.js.ep | 1 + 5 files changed, 43 insertions(+), 32 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 72ef946..2014614 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Revision history for Lufi ?.??.? ????-??-?? + - Notifications when uploading and downloading files (#181) 0.04.6 2019-11-07 - Now can send large files (>2Gio) while using a DB other than SQLite (#165) diff --git a/themes/default/lib/Lufi/I18N/lufi.pot b/themes/default/lib/Lufi/I18N/lufi.pot index 0a3ec3b..47a989c 100644 --- a/themes/default/lib/Lufi/I18N/lufi.pot +++ b/themes/default/lib/Lufi/I18N/lufi.pot @@ -45,7 +45,7 @@ msgstr "" msgid "%A %d %B %Y at %T" msgstr "" -#: themes/default/templates/partial/index.js.ep:27 +#: themes/default/templates/partial/index.js.ep:28 msgid "(max size: XXX)" msgstr "" @@ -90,7 +90,7 @@ msgid "As Lufi is a free software licensed under of the terms of the <a href=\"h msgstr "" #. (stash('nbslices') -#: themes/default/templates/partial/render.js.ep:9 +#: themes/default/templates/partial/render.js.ep:10 msgid "Asking for file part XX1 of %1" msgstr "" @@ -254,10 +254,18 @@ msgstr "" msgid "File deleted" msgstr "" +#: themes/default/templates/partial/render.js.ep:9 +msgid "File downloaded" +msgstr "" + #: themes/default/templates/files.html.ep:27 msgid "File name" msgstr "" +#: themes/default/templates/partial/index.js.ep:24 +msgid "File uploaded" +msgstr "" + #: themes/default/templates/invitations/my_invitations.html.ep:61 msgid "Files" msgstr "" @@ -307,11 +315,11 @@ msgstr "" msgid "Hide hidden invitations" msgstr "" -#: themes/default/templates/partial/index.js.ep:25 +#: themes/default/templates/partial/index.js.ep:26 msgid "Hit Enter, then Ctrl+C to copy all the download links" msgstr "" -#: themes/default/templates/partial/index.js.ep:24 +#: themes/default/templates/partial/index.js.ep:25 msgid "Hit Enter, then Ctrl+C to copy the download link" msgstr "" @@ -422,7 +430,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:28 +#: themes/default/templates/partial/files.js.ep:10 themes/default/templates/partial/index.js.ep:29 msgid "No expiration delay" msgstr "" @@ -479,7 +487,7 @@ msgstr "" msgid "Rows in red mean that the files have expired and are no longer available." msgstr "" -#: themes/default/templates/partial/index.js.ep:26 +#: themes/default/templates/partial/index.js.ep:27 msgid "Send all links by email" msgstr "" @@ -495,7 +503,7 @@ msgstr "" msgid "Send with your own mail software" msgstr "" -#: themes/default/templates/partial/index.js.ep:29 +#: themes/default/templates/partial/index.js.ep:30 msgid "Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move." msgstr "" @@ -508,7 +516,7 @@ msgstr "" msgid "Show hidden invitations" msgstr "" -#: themes/default/templates/partial/render.js.ep:11 +#: themes/default/templates/partial/render.js.ep:12 msgid "Show zip content" msgstr "" @@ -686,7 +694,7 @@ msgstr "" msgid "Uploaded files" msgstr "" -#: themes/default/templates/partial/index.js.ep:30 +#: themes/default/templates/partial/index.js.ep:31 msgid "Websocket communication error" msgstr "" @@ -718,7 +726,7 @@ msgstr "" msgid "You don't need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don't panic, this is normally the case for all sites on which you send files." msgstr "" -#: themes/default/templates/partial/render.js.ep:10 +#: themes/default/templates/partial/render.js.ep:11 msgid "You don't seem to have a key in your URL. You won't be able to decrypt the file. Download canceled." msgstr "" @@ -751,7 +759,7 @@ msgstr "" msgid "Your password is not valid. Please refresh the page to retry." msgstr "" -#: themes/default/templates/partial/render.js.ep:12 +#: themes/default/templates/partial/render.js.ep:13 msgid "Zip content:" msgstr "" diff --git a/themes/default/public/js/lufi-notifications.js b/themes/default/public/js/lufi-notifications.js index 7a8d221..d198df6 100644 --- a/themes/default/public/js/lufi-notifications.js +++ b/themes/default/public/js/lufi-notifications.js @@ -1,5 +1,6 @@ function notify(title, body) { if (!Notification) { + console.log("This browser does not support desktop notification, cannot send following message: "+title+" "+body); return; } @@ -19,6 +20,7 @@ document.addEventListener('DOMContentLoaded', function () { return; } - if (Notification.permission !== "granted") + if (Notification.permission !== "granted") { Notification.requestPermission(); -}); \ No newline at end of file + } +}); diff --git a/themes/default/templates/partial/index.js.ep b/themes/default/templates/partial/index.js.ep index 525eecd..241d371 100644 --- a/themes/default/templates/partial/index.js.ep +++ b/themes/default/templates/partial/index.js.ep @@ -10,26 +10,25 @@ var baseURL = '<%= url_for('/')->to_abs() %>'; % } var actionURL = '<%= url_for('/')->to_abs() %>'; var i18n = { - enqueued: '<%= l('XXX file has been added to upload queue.') %>', - confirmExit: '<%= l('You have attempted to leave this page. The upload will be canceled. Are you sure?') %>', - copyAll: '<%= l('Copy all links to clipboard') %>', - copySuccess: '<%= l('The link(s) has been copied to your clipboard') %>', - copyFail: '<%= l('Unable to copy the link(s) to your clipboard') %>', - cpText: '<%= l('Copy to clipboard') %>', - delText: '<%= l('Deletion link') %>', - dlText: '<%= l('Download link') %>', - download: '<%= l('Download') %>', - encrypting: '<%= l('Encrypting part XX1 of XX2') %>', - expiration: '<%= l('Expiration:') %>', - hit: '<%= l('Hit Enter, then Ctrl+C to copy the download link') %>', - hits: '<%= l('Hit Enter, then Ctrl+C to copy all the download links') %>', - mailTo: '<%= l('Send all links by email') %>', - maxSize: '<%= l('(max size: XXX)') %>', - noLimit: '<%= l('No expiration delay') %>', - sending: '<%= l('Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move.') %>', - wsProblem: '<%= l('Websocket communication error') %>', - fileDownloaded: '<%= l('File downloaded') %>', + enqueued: '<%= l('XXX file has been added to upload queue.') %>', + confirmExit: '<%= l('You have attempted to leave this page. The upload will be canceled. Are you sure?') %>', + copyAll: '<%= l('Copy all links to clipboard') %>', + copySuccess: '<%= l('The link(s) has been copied to your clipboard') %>', + copyFail: '<%= l('Unable to copy the link(s) to your clipboard') %>', + cpText: '<%= l('Copy to clipboard') %>', + delText: '<%= l('Deletion link') %>', + dlText: '<%= l('Download link') %>', + download: '<%= l('Download') %>', + encrypting: '<%= l('Encrypting part XX1 of XX2') %>', + expiration: '<%= l('Expiration:') %>', fileUploaded: '<%= l('File uploaded') %>', + hit: '<%= l('Hit Enter, then Ctrl+C to copy the download link') %>', + hits: '<%= l('Hit Enter, then Ctrl+C to copy all the download links') %>', + mailTo: '<%= l('Send all links by email') %>', + maxSize: '<%= l('(max size: XXX)') %>', + noLimit: '<%= l('No expiration delay') %>', + sending: '<%= l('Sending part XX1 of XX2. Please, be patient, the progress bar can take a while to move.') %>', + wsProblem: '<%= l('Websocket communication error') %>', }; var maxSize = <%= config('max_file_size') || 0 %>; diff --git a/themes/default/templates/partial/render.js.ep b/themes/default/templates/partial/render.js.ep index 174438a..4ca1131 100644 --- a/themes/default/templates/partial/render.js.ep +++ b/themes/default/templates/partial/render.js.ep @@ -6,6 +6,7 @@ var i18n = { badkey: '<%= l('It seems that the key in your URL is incorrect. Please, verify your URL.') %>', confirmExit: '<%= l('You have attempted to leave this page. The download will be canceled. Are you sure?') %>', download: '<%= l('Get the file') %>', + fileDownloaded: '<%= l('File downloaded') %>', loading: '<%= l('Asking for file part XX1 of %1', stash('nbslices')) %>', nokey: '<%= l('You don\'t seem to have a key in your URL. You won\'t be able to decrypt the file. Download canceled.') %>', showZipContent: '<%= l('Show zip content') %>',