diff --git a/README.md b/README.md index c381752..ae3a8c2 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,27 @@ copias en otros lugares: ### ¿Y el sistema de comentarios? -Por ahora no existe el sistema de comentarios. +Puedes [mandarme el comentario por correo +electrónico](mailto:heckyel@riseup.net) con el +siguiente formato: + +``` +post_id: my-blog-slug +Author: Name +Date: 2019-11-15 18:44 +Email: snowden@example.xu +Slug: snowden-20191115-15:39:51 + +Este es un mensaje de prueba. +``` + +o rellenar directamente desde el formulario de +comentarios de CL. + +Por motivos de privacidad y nuestra +[política de uso](https://conocimientoslibres.tuxfamily.org/pages/politica-de-uso.html) +tus comentarios NUNCA serán publicados en los repositorios +GIT. ### ¿Y los vídeos? diff --git a/cl-theme/messages.pot b/cl-theme/messages.pot index adccc31..741e58e 100644 --- a/cl-theme/messages.pot +++ b/cl-theme/messages.pot @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-07-14 11:36-0500\n" +"POT-Creation-Date: 2019-11-17 21:37-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.6.0\n" +"Generated-By: Babel 2.7.0\n" #: templates/archives.html:4 msgid "Lista de artículos publicados en Conocimientos Libres." @@ -37,24 +37,57 @@ msgid_plural "%(num)d artículos" msgstr[0] "" msgstr[1] "" -#: templates/article.html:115 templates/authors.html:109 templates/page.html:84 +#: templates/article.html:121 templates/authors.html:104 templates/page.html:84 msgid "Regresar al Inicio" msgstr "" -#: templates/article.html:131 templates/article_info.html:16 +#: templates/article.html:137 templates/article_info.html:16 #, python-format msgid "Artículos de %(nombre_mes)s de %(año)s" msgstr "" -#: templates/article.html:135 templates/article_info.html:20 +#: templates/article.html:141 templates/article_info.html:20 #, python-format msgid "Artículos de %(año)s" msgstr "" -#: templates/article.html:149 templates/article_info.html:47 +#: templates/article.html:155 templates/article_info.html:47 msgid "Autor del artículo" msgstr "" +#: templates/article.html:175 +msgid "Comentarios" +msgstr "" + +#: templates/article.html:239 +msgid "Su nombre o nick" +msgstr "" + +#: templates/article.html:245 +msgid "E-mail (requerido, no será publicado)" +msgstr "" + +#: templates/article.html:252 +msgid "Su sitio web (opcional)" +msgstr "" + +#: templates/article.html:258 +msgid "Agrega un comentario..." +msgstr "" + +#: templates/article.html:263 +msgid "Puede formatear su comentario con" +msgstr "" + +#: templates/article.html:271 +msgid "Enviar comentario" +msgstr "" + +#: templates/article.html:274 templates/article.html:276 +#: templates/article.html:278 +msgid "Política de uso" +msgstr "" + #: templates/article_info.html:32 msgid "Fecha de modificación" msgstr "" @@ -87,7 +120,7 @@ msgstr "" msgid "Autores de %(SITENAME)s" msgstr "" -#: templates/authors.html:19 templates/base.html:64 +#: templates/authors.html:19 templates/base.html:65 msgid "Créditos" msgstr "" @@ -124,16 +157,16 @@ msgstr "" msgid "Software que usa la página" msgstr "" -#: templates/authors.html:64 +#: templates/authors.html:59 msgid "Algunos programas de JavaScript" msgstr "" -#: templates/authors.html:67 +#: templates/authors.html:62 #, python-format msgid "Sitio web de %(programa)s" msgstr "" -#: templates/authors.html:70 +#: templates/authors.html:65 msgid "Miscelánea" msgstr "" @@ -150,40 +183,40 @@ msgid "" "web,Hyperbola" msgstr "" -#: templates/base.html:59 +#: templates/base.html:60 msgid "Inicio" msgstr "" -#: templates/base.html:63 +#: templates/base.html:64 msgid "Archivos" msgstr "" -#: templates/base.html:94 +#: templates/base.html:95 msgid "» » » » » » búscame « « « « « «" msgstr "" -#: templates/base.html:96 +#: templates/base.html:97 msgid "Buscar" msgstr "" -#: templates/base.html:142 +#: templates/base.html:143 #, python-format msgid "Enlace a %(articulo)s" msgstr "" -#: templates/base.html:275 +#: templates/base.html:276 msgid "Escrito por" msgstr "" -#: templates/base.html:278 +#: templates/base.html:279 msgid "Este sitio es Software Libre" msgstr "" -#: templates/base.html:280 +#: templates/base.html:281 msgid "Código fuente" msgstr "" -#: templates/base.html:288 +#: templates/base.html:289 msgid "Licencias de JavaScript" msgstr "" @@ -209,3 +242,8 @@ msgstr "" #, python-format msgid "Archivos del %(dia)d de %(mes)s de %(año)d" msgstr "" + +#: templates/translations.html:3 +msgid "Traducciones:" +msgstr "" + diff --git a/cl-theme/static/images/avatar/avatar.png b/cl-theme/static/images/avatar/avatar.png new file mode 100644 index 0000000..f808479 Binary files /dev/null and b/cl-theme/static/images/avatar/avatar.png differ diff --git a/cl-theme/templates/article.html b/cl-theme/templates/article.html index eeb7828..1aa0972 100644 --- a/cl-theme/templates/article.html +++ b/cl-theme/templates/article.html @@ -1,3 +1,4 @@ +{# {% import 'pcs/comments.html' as pcs with context %} #} {% extends "base.html" %} {% block html_lang %}{{ article.lang }}{% endblock %} @@ -167,6 +168,126 @@ + +
+ +
+

{{ _('Comentarios') }}

+
+ +
+ +
+ + {% if article.comments %} + {% for comment in article.comments %} + +
+ +
+

+ {% if comment.avatar %} + {{ comment.author }} + {% else %} + {{ comment.author }} + {% endif %} +

+
+ + + +
+
+ {% if comment.web %} +

+ + {{ comment.author }} + +

+ {% else %} +

{{ comment.author }}

+ {% endif %} + {{ comment.content }} + Permalink + | {{ comment.date }} +
+
+ +
+ + {% endfor %} + {% endif %} + + +
+ + +
+

+ placeholder +

+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+

+ +

+
+
+
+

{{ _('Puede formatear su comentario con') }} + Markdown. +

+
+
+
+

+ + + {% if DEFAULT_LANG == 'en' %} + {{ _('Política de uso') }} + {% elif DEFAULT_LANG == 'fr' %} + {{ _('Política de uso') }} + {% else %} + {{ _('Política de uso') }} + {% endif %} + +

+
+
+
+ +
+
+
+ + diff --git a/cl-theme/translations/de/LC_MESSAGES/messages.po b/cl-theme/translations/de/LC_MESSAGES/messages.po index 710a77d..5ddec39 100644 --- a/cl-theme/translations/de/LC_MESSAGES/messages.po +++ b/cl-theme/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-07-14 11:36-0500\n" +"POT-Creation-Date: 2019-11-17 21:37-0500\n" "PO-Revision-Date: 2019-03-11 11:27-0500\n" "Last-Translator: \n" "Language: de\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.6.0\n" +"Generated-By: Babel 2.7.0\n" #: templates/archives.html:4 msgid "Lista de artículos publicados en Conocimientos Libres." @@ -38,24 +38,57 @@ msgid_plural "%(num)d artículos" msgstr[0] "%(num)d artikel" msgstr[1] "%(num)d artikel" -#: templates/article.html:115 templates/authors.html:109 templates/page.html:84 +#: templates/article.html:121 templates/authors.html:104 templates/page.html:84 msgid "Regresar al Inicio" msgstr "Zurück zum Anfang" -#: templates/article.html:131 templates/article_info.html:16 +#: templates/article.html:137 templates/article_info.html:16 #, python-format msgid "Artículos de %(nombre_mes)s de %(año)s" msgstr "Artikel von %(nombre_mes)s von %(año)s" -#: templates/article.html:135 templates/article_info.html:20 +#: templates/article.html:141 templates/article_info.html:20 #, python-format msgid "Artículos de %(año)s" msgstr "Artikel in %(año)s" -#: templates/article.html:149 templates/article_info.html:47 +#: templates/article.html:155 templates/article_info.html:47 msgid "Autor del artículo" msgstr "Autor des Artikel" +#: templates/article.html:175 +msgid "Comentarios" +msgstr "Kommentare" + +#: templates/article.html:239 +msgid "Su nombre o nick" +msgstr "Name oder Nick" + +#: templates/article.html:245 +msgid "E-mail (requerido, no será publicado)" +msgstr "E-mail (erforderlich, wird nicht veröffentlicht)" + +#: templates/article.html:252 +msgid "Su sitio web (opcional)" +msgstr "Website (optional)" + +#: templates/article.html:258 +msgid "Agrega un comentario..." +msgstr "Kommentar hinzufügen..." + +#: templates/article.html:263 +msgid "Puede formatear su comentario con" +msgstr "Sie können Ihren Kommentar mit formatieren" + +#: templates/article.html:271 +msgid "Enviar comentario" +msgstr "Kommentar senden" + +#: templates/article.html:274 templates/article.html:276 +#: templates/article.html:278 +msgid "Política de uso" +msgstr "Nutzungsrichtlinien" + #: templates/article_info.html:32 msgid "Fecha de modificación" msgstr "Datum der Änderung" @@ -88,7 +121,7 @@ msgstr "autoren, autoren, mitarbeitern, autoren, liste der autoren" msgid "Autores de %(SITENAME)s" msgstr "Autoren von %(SITENAME)s" -#: templates/authors.html:19 templates/base.html:64 +#: templates/authors.html:19 templates/base.html:65 msgid "Créditos" msgstr "Kredite" @@ -125,16 +158,16 @@ msgstr "Alyssa Rosenzweig Website" msgid "Software que usa la página" msgstr "Software, die die Seite verwendet" -#: templates/authors.html:64 +#: templates/authors.html:59 msgid "Algunos programas de JavaScript" msgstr "Einige JavaScript-Programme" -#: templates/authors.html:67 +#: templates/authors.html:62 #, python-format msgid "Sitio web de %(programa)s" msgstr "Website von %(programa)s" -#: templates/authors.html:70 +#: templates/authors.html:65 msgid "Miscelánea" msgstr "Sammelband" @@ -155,40 +188,40 @@ msgstr "" "freie Software, freiheit, meinungsfreiheit, datenschutz, schulungen, " "tutorials, anleitungen, GNU/Linux, webentwicklung, Hyperbola" -#: templates/base.html:59 +#: templates/base.html:60 msgid "Inicio" msgstr "Anfang" -#: templates/base.html:63 +#: templates/base.html:64 msgid "Archivos" msgstr "Archiv" -#: templates/base.html:94 +#: templates/base.html:95 msgid "» » » » » » búscame « « « « « «" msgstr "» » » » » » Suche « « « « « « «" -#: templates/base.html:96 +#: templates/base.html:97 msgid "Buscar" msgstr "Suche" -#: templates/base.html:142 +#: templates/base.html:143 #, python-format msgid "Enlace a %(articulo)s" msgstr "Link zu %(articulo)s" -#: templates/base.html:275 +#: templates/base.html:276 msgid "Escrito por" msgstr "Geschrieben von" -#: templates/base.html:278 +#: templates/base.html:279 msgid "Este sitio es Software Libre" msgstr "Diese Seite ist Freie Software" -#: templates/base.html:280 +#: templates/base.html:281 msgid "Código fuente" msgstr "Quellcode" -#: templates/base.html:288 +#: templates/base.html:289 msgid "Licencias de JavaScript" msgstr "JavaScript-Lizenzen" @@ -214,3 +247,7 @@ msgstr "Dateien von %(mes)s von %(año)d" #, python-format msgid "Archivos del %(dia)d de %(mes)s de %(año)d" msgstr "Dateien von %(dia)d von %(mes)s von %(año)d" + +#: templates/translations.html:3 +msgid "Traducciones:" +msgstr "Übersetzungen:" diff --git a/cl-theme/translations/en/LC_MESSAGES/messages.po b/cl-theme/translations/en/LC_MESSAGES/messages.po index 8159bf8..556149e 100644 --- a/cl-theme/translations/en/LC_MESSAGES/messages.po +++ b/cl-theme/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cybersy\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-07-14 11:36-0500\n" +"POT-Creation-Date: 2019-11-17 21:37-0500\n" "PO-Revision-Date: 2019-03-11 10:44-0500\n" "Last-Translator: Jesús E. \n" "Language: en\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.6.0\n" +"Generated-By: Babel 2.7.0\n" #: templates/archives.html:4 msgid "Lista de artículos publicados en Conocimientos Libres." @@ -38,24 +38,57 @@ msgid_plural "%(num)d artículos" msgstr[0] "%(num)d article" msgstr[1] "%(num)d articles" -#: templates/article.html:115 templates/authors.html:109 templates/page.html:84 +#: templates/article.html:121 templates/authors.html:104 templates/page.html:84 msgid "Regresar al Inicio" msgstr "Back to Home" -#: templates/article.html:131 templates/article_info.html:16 +#: templates/article.html:137 templates/article_info.html:16 #, python-format msgid "Artículos de %(nombre_mes)s de %(año)s" msgstr "Articles of %(nombre_mes)s of %(año)s" -#: templates/article.html:135 templates/article_info.html:20 +#: templates/article.html:141 templates/article_info.html:20 #, python-format msgid "Artículos de %(año)s" msgstr "Articles of %(año)s" -#: templates/article.html:149 templates/article_info.html:47 +#: templates/article.html:155 templates/article_info.html:47 msgid "Autor del artículo" msgstr "Author of article" +#: templates/article.html:175 +msgid "Comentarios" +msgstr "Comments" + +#: templates/article.html:239 +msgid "Su nombre o nick" +msgstr "Your name or nick" + +#: templates/article.html:245 +msgid "E-mail (requerido, no será publicado)" +msgstr "E-mail (required, will not be published)" + +#: templates/article.html:252 +msgid "Su sitio web (opcional)" +msgstr "Your website (optional)" + +#: templates/article.html:258 +msgid "Agrega un comentario..." +msgstr "Add a comment..." + +#: templates/article.html:263 +msgid "Puede formatear su comentario con" +msgstr "You can format your comment with" + +#: templates/article.html:271 +msgid "Enviar comentario" +msgstr "Send comment" + +#: templates/article.html:274 templates/article.html:276 +#: templates/article.html:278 +msgid "Política de uso" +msgstr "Usage Policy" + #: templates/article_info.html:32 msgid "Fecha de modificación" msgstr "Modification date" @@ -88,7 +121,7 @@ msgstr "writers, authors, collaborators, writers, list of authors" msgid "Autores de %(SITENAME)s" msgstr "Authors %(SITENAME)s" -#: templates/authors.html:19 templates/base.html:64 +#: templates/authors.html:19 templates/base.html:65 msgid "Créditos" msgstr "Credits" @@ -125,16 +158,16 @@ msgstr "Alyssa Rosenzweig website" msgid "Software que usa la página" msgstr "Software that uses the page" -#: templates/authors.html:64 +#: templates/authors.html:59 msgid "Algunos programas de JavaScript" msgstr "Some JavaScript programs" -#: templates/authors.html:67 +#: templates/authors.html:62 #, python-format msgid "Sitio web de %(programa)s" msgstr "Website of %(programa)s" -#: templates/authors.html:70 +#: templates/authors.html:65 msgid "Miscelánea" msgstr "Miscellany" @@ -155,40 +188,40 @@ msgstr "" "free software, freedom, freedom of expression, privacy, training, " "tutorials, guides, GNU/Linux, web development, Hyperbola" -#: templates/base.html:59 +#: templates/base.html:60 msgid "Inicio" msgstr "Home" -#: templates/base.html:63 +#: templates/base.html:64 msgid "Archivos" msgstr "Archives" -#: templates/base.html:94 +#: templates/base.html:95 msgid "» » » » » » búscame « « « « « «" msgstr "» » » » » » find me « « « « « «" -#: templates/base.html:96 +#: templates/base.html:97 msgid "Buscar" msgstr "Search" -#: templates/base.html:142 +#: templates/base.html:143 #, python-format msgid "Enlace a %(articulo)s" msgstr "Link to %(articulo)s" -#: templates/base.html:275 +#: templates/base.html:276 msgid "Escrito por" msgstr "Written by" -#: templates/base.html:278 +#: templates/base.html:279 msgid "Este sitio es Software Libre" msgstr "This site is Free Software" -#: templates/base.html:280 +#: templates/base.html:281 msgid "Código fuente" msgstr "Source code" -#: templates/base.html:288 +#: templates/base.html:289 msgid "Licencias de JavaScript" msgstr "JavaScript licenses" @@ -214,3 +247,7 @@ msgstr "Files of %(mes)s of %(año)d" #, python-format msgid "Archivos del %(dia)d de %(mes)s de %(año)d" msgstr "Files of %(dia)d of %(mes)s of %(año)d" + +#: templates/translations.html:3 +msgid "Traducciones:" +msgstr "Translations:" diff --git a/cl-theme/translations/eo/LC_MESSAGES/messages.po b/cl-theme/translations/eo/LC_MESSAGES/messages.po index 916e4f7..4feeae2 100644 --- a/cl-theme/translations/eo/LC_MESSAGES/messages.po +++ b/cl-theme/translations/eo/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-07-14 11:36-0500\n" +"POT-Creation-Date: 2019-11-17 21:37-0500\n" "PO-Revision-Date: 2019-03-11 11:46-0500\n" "Last-Translator: \n" "Language: eo\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.6.0\n" +"Generated-By: Babel 2.7.0\n" #: templates/archives.html:4 msgid "Lista de artículos publicados en Conocimientos Libres." @@ -38,24 +38,57 @@ msgid_plural "%(num)d artículos" msgstr[0] "%(num)d artikolo" msgstr[1] "%(num)d artikoloj" -#: templates/article.html:115 templates/authors.html:109 templates/page.html:84 +#: templates/article.html:121 templates/authors.html:104 templates/page.html:84 msgid "Regresar al Inicio" msgstr "Reen Ĉapeli" -#: templates/article.html:131 templates/article_info.html:16 +#: templates/article.html:137 templates/article_info.html:16 #, python-format msgid "Artículos de %(nombre_mes)s de %(año)s" msgstr "Artikoloj de %(nombre_mes)s de %(año)s" -#: templates/article.html:135 templates/article_info.html:20 +#: templates/article.html:141 templates/article_info.html:20 #, python-format msgid "Artículos de %(año)s" msgstr "Artikoloj de %(año)s" -#: templates/article.html:149 templates/article_info.html:47 +#: templates/article.html:155 templates/article_info.html:47 msgid "Autor del artículo" msgstr "Aŭtoro de la artikolo" +#: templates/article.html:175 +msgid "Comentarios" +msgstr "Komentoj" + +#: templates/article.html:239 +msgid "Su nombre o nick" +msgstr "Nomo aŭ kromnomo" + +#: templates/article.html:245 +msgid "E-mail (requerido, no será publicado)" +msgstr "E-mail (bezonata, ne estos publikigita)" + +#: templates/article.html:252 +msgid "Su sitio web (opcional)" +msgstr "Retejo (laŭvola)" + +#: templates/article.html:258 +msgid "Agrega un comentario..." +msgstr "Aldonu komenton..." + +#: templates/article.html:263 +msgid "Puede formatear su comentario con" +msgstr "Vi povas formati vian komenton per" + +#: templates/article.html:271 +msgid "Enviar comentario" +msgstr "Sendu komenton" + +#: templates/article.html:274 templates/article.html:276 +#: templates/article.html:278 +msgid "Política de uso" +msgstr "Uzado-Politiko" + #: templates/article_info.html:32 msgid "Fecha de modificación" msgstr "Dato de modifo" @@ -90,7 +123,7 @@ msgstr "verkistoj, aŭtoroj, kunlaborantoj, verkistoj, listo de aŭtoroj" msgid "Autores de %(SITENAME)s" msgstr "Aŭtoroj de %(SITENAME)s" -#: templates/authors.html:19 templates/base.html:64 +#: templates/authors.html:19 templates/base.html:65 msgid "Créditos" msgstr "Kreditoj" @@ -127,16 +160,16 @@ msgstr "Alyssa Rosenzweig-retejo" msgid "Software que usa la página" msgstr "Programaro kiu uzas la paĝo" -#: templates/authors.html:64 +#: templates/authors.html:59 msgid "Algunos programas de JavaScript" msgstr "ILj programoj de JavaScript" -#: templates/authors.html:67 +#: templates/authors.html:62 #, python-format msgid "Sitio web de %(programa)s" msgstr "Retejo de %(programa)s" -#: templates/authors.html:70 +#: templates/authors.html:65 msgid "Miscelánea" msgstr "Miscellaneous" @@ -157,40 +190,40 @@ msgstr "" "libera programaro, libereco, libereco de esprimo, privateco, trejnado, " "tutoriaĵoj, gvidiloj, GNU/Linux, retejo, Hyperbola" -#: templates/base.html:59 +#: templates/base.html:60 msgid "Inicio" msgstr "Hejmo" -#: templates/base.html:63 +#: templates/base.html:64 msgid "Archivos" msgstr "Arkivoj" -#: templates/base.html:94 +#: templates/base.html:95 msgid "» » » » » » búscame « « « « « «" msgstr "» » » » » » Serĉu « « « « « «" -#: templates/base.html:96 +#: templates/base.html:97 msgid "Buscar" msgstr "Serĉi" -#: templates/base.html:142 +#: templates/base.html:143 #, python-format msgid "Enlace a %(articulo)s" msgstr "Ligilo al %(articulo)s" -#: templates/base.html:275 +#: templates/base.html:276 msgid "Escrito por" msgstr "Skribita de" -#: templates/base.html:278 +#: templates/base.html:279 msgid "Este sitio es Software Libre" msgstr "Ĉi tiu retejo estas Libera Programaro" -#: templates/base.html:280 +#: templates/base.html:281 msgid "Código fuente" msgstr "Fonta kodo" -#: templates/base.html:288 +#: templates/base.html:289 msgid "Licencias de JavaScript" msgstr "JavaScript permesiloj" @@ -216,3 +249,7 @@ msgstr "Dosieroj de %(mes)s de %(año)d" #, python-format msgid "Archivos del %(dia)d de %(mes)s de %(año)d" msgstr "Dosieroj de %(dia)d de %(mes)s de %(año)d" + +#: templates/translations.html:3 +msgid "Traducciones:" +msgstr "Tradukoj:" diff --git a/cl-theme/translations/fr/LC_MESSAGES/messages.po b/cl-theme/translations/fr/LC_MESSAGES/messages.po index 63f67c6..82e211e 100644 --- a/cl-theme/translations/fr/LC_MESSAGES/messages.po +++ b/cl-theme/translations/fr/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-07-14 11:36-0500\n" +"POT-Creation-Date: 2019-11-17 21:37-0500\n" "PO-Revision-Date: 2019-03-11 12:33-0500\n" "Last-Translator: \n" "Language: fr\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.6.0\n" +"Generated-By: Babel 2.7.0\n" #: templates/archives.html:4 msgid "Lista de artículos publicados en Conocimientos Libres." @@ -38,24 +38,57 @@ msgid_plural "%(num)d artículos" msgstr[0] "%(num)d article" msgstr[1] "%(num)d articles" -#: templates/article.html:115 templates/authors.html:109 templates/page.html:84 +#: templates/article.html:121 templates/authors.html:104 templates/page.html:84 msgid "Regresar al Inicio" msgstr "Retour à la initiation" -#: templates/article.html:131 templates/article_info.html:16 +#: templates/article.html:137 templates/article_info.html:16 #, python-format msgid "Artículos de %(nombre_mes)s de %(año)s" msgstr "Articles de %(nombre_mes)s de %(año)s" -#: templates/article.html:135 templates/article_info.html:20 +#: templates/article.html:141 templates/article_info.html:20 #, python-format msgid "Artículos de %(año)s" msgstr "Articles de %(año)s" -#: templates/article.html:149 templates/article_info.html:47 +#: templates/article.html:155 templates/article_info.html:47 msgid "Autor del artículo" msgstr "Auteur de l'article" +#: templates/article.html:175 +msgid "Comentarios" +msgstr "Commentaires" + +#: templates/article.html:239 +msgid "Su nombre o nick" +msgstr "Votre nom ou pseudo" + +#: templates/article.html:245 +msgid "E-mail (requerido, no será publicado)" +msgstr "E-mail (obligatoire, ne sera pas publié)" + +#: templates/article.html:252 +msgid "Su sitio web (opcional)" +msgstr "Votre site web (optionnel)" + +#: templates/article.html:258 +msgid "Agrega un comentario..." +msgstr "Ajouter un commentaire..." + +#: templates/article.html:263 +msgid "Puede formatear su comentario con" +msgstr "Vous pouvez formater votre commentaire avec" + +#: templates/article.html:271 +msgid "Enviar comentario" +msgstr "Envoyer un commentaire" + +#: templates/article.html:274 templates/article.html:276 +#: templates/article.html:278 +msgid "Política de uso" +msgstr "Politique d'utilisation" + #: templates/article_info.html:32 msgid "Fecha de modificación" msgstr "Date de modification" @@ -88,7 +121,7 @@ msgstr "écrivains, auteurs, collaborateurs, écrivains, liste des auteurs" msgid "Autores de %(SITENAME)s" msgstr "Auteurs de %(SITENAME)s" -#: templates/authors.html:19 templates/base.html:64 +#: templates/authors.html:19 templates/base.html:65 msgid "Créditos" msgstr "Crédits" @@ -125,16 +158,16 @@ msgstr "Site Web d'Alyssa Rosenzweig" msgid "Software que usa la página" msgstr "Logiciel qui utilise la page" -#: templates/authors.html:64 +#: templates/authors.html:59 msgid "Algunos programas de JavaScript" msgstr "Quelques programmes JavaScript" -#: templates/authors.html:67 +#: templates/authors.html:62 #, python-format msgid "Sitio web de %(programa)s" msgstr "Site web de %(programa)s" -#: templates/authors.html:70 +#: templates/authors.html:65 msgid "Miscelánea" msgstr "Divers" @@ -155,40 +188,40 @@ msgstr "" "logiciel libre, liberté, liberté d'expression, vie privée, formation, " "tutoriels, guides, GNU / Linux, développement Web, Hyperbola" -#: templates/base.html:59 +#: templates/base.html:60 msgid "Inicio" msgstr "Initiation" -#: templates/base.html:63 +#: templates/base.html:64 msgid "Archivos" msgstr "Les archives" -#: templates/base.html:94 +#: templates/base.html:95 msgid "» » » » » » búscame « « « « « «" msgstr "» » » » » » Rechercher « « « « « « «" -#: templates/base.html:96 +#: templates/base.html:97 msgid "Buscar" msgstr "Recherche" -#: templates/base.html:142 +#: templates/base.html:143 #, python-format msgid "Enlace a %(articulo)s" msgstr "Lien vers %(articulo)s" -#: templates/base.html:275 +#: templates/base.html:276 msgid "Escrito por" msgstr "Écrit par" -#: templates/base.html:278 +#: templates/base.html:279 msgid "Este sitio es Software Libre" msgstr "Ce site est un logiciel libre" -#: templates/base.html:280 +#: templates/base.html:281 msgid "Código fuente" msgstr "Code source" -#: templates/base.html:288 +#: templates/base.html:289 msgid "Licencias de JavaScript" msgstr "Licences JavaScript" @@ -214,3 +247,7 @@ msgstr "Fichiers de %(mes)s de %(año)d" #, python-format msgid "Archivos del %(dia)d de %(mes)s de %(año)d" msgstr "Fichiers de %(dia)d sur %(mes)s sur %(año)d" + +#: templates/translations.html:3 +msgid "Traducciones:" +msgstr "Traductions:" diff --git a/content/comments/.gitignore b/content/comments/.gitignore new file mode 100644 index 0000000..86d0cb2 --- /dev/null +++ b/content/comments/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/content/vendor/form-comments/commentsubmit.php b/content/vendor/form-comments/commentsubmit.php new file mode 100644 index 0000000..c78e39d --- /dev/null +++ b/content/vendor/form-comments/commentsubmit.php @@ -0,0 +1,71 @@ + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/plugins/pelican_comments/README.md b/plugins/pelican_comments/README.md new file mode 100644 index 0000000..c2bba90 --- /dev/null +++ b/plugins/pelican_comments/README.md @@ -0,0 +1,80 @@ +# pelican-comments + +This is a plugin for [pelican](http://getpelican.com) to provide static comments. + +It was inspired by a [similar plugin for +Jekyll](https://github.com/mpalmer/jekyll-static-comments). + +# How It Works + +When enabled, the plugin searches a comments directory in your pelican +tree. In that directory, there is one file per comment. Each comment +file has a `post_id` attribute with the slug of the post to which the +comment belongs. The article template will receive a `comments` attribute +which contains the list of comments on the post. + +# Installation + +Pelican-comments is not part of the default pelican distribution. + +In your settings.py, add: + + PLUGINS = ['pelican_comments'] + COMMENTS_DIR = ['comments'] # Optional: 'comments' is the default + ARTICLE_EXCLUDES = ['comments', 'pages'] # Optional: Stops pelican trying to validate comments as articles + +In your template, add: + + {% if article.comments %} +

Comments

+
    + {% for comment in article.comments %} +
  • +

    {{ comment.author }} said, on {{ comment.date }}:

    + {{ comment.content }} +
    • + {% endfor %} +
+ {% endif %} + +In your pelican tree, create a comments directory. Add one file per +comment on your blog. Make sure that each comment file has a `post_id` +attribute to tie it to a post. You can also include the comments' +authors and date/time. For example: + + post_id: one-of-my-post-slugs + Author: some random guy + Date: 2019-09-27 18:44 + + This is a test. + +It doesn't matter what the files are named. + +# Example folder structure + + . + └── comments + └── foo-bar + │ ├── 1.md + │ └── 0.md + └── some-other-slug + ├── random-Name.md + ├── 1.md + └── 0.md + +# Generating the Comment Files + +Script for processing a comment submission form coming soon. + +Script to import comments from a wordpress export file coming soon. + +See also +[this php +script](https://github.com/mpalmer/jekyll-static-comments/blob/master/commentsubmit.php), +which should be relatively easy to hack into +submission. More discussion [in this blog +post](http://hezmatt.org/~mpalmer/blog/2011/07/19/static-comments-in-jekyll.html). + +You'll need some kind of workflow to allow you to move comments from +email or other holding area (I plan to use the filesystem on the webhost) +to your pelican tree. diff --git a/plugins/pelican_comments/__init__.py b/plugins/pelican_comments/__init__.py new file mode 100644 index 0000000..5dec534 --- /dev/null +++ b/plugins/pelican_comments/__init__.py @@ -0,0 +1 @@ +from .pelican_comments import * diff --git a/plugins/pelican_comments/pelican_comments.py b/plugins/pelican_comments/pelican_comments.py new file mode 100644 index 0000000..3a75ba2 --- /dev/null +++ b/plugins/pelican_comments/pelican_comments.py @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2012, Brian St. Pierre +# Copyright (c) 2019, Jesús E. + +import sys + +import collections +import hashlib # libravatar + +import pelican.signals as signals +import pelican.generators as generators +import pelican.readers as readers + +from pelican.contents import Content + + +# Python 3 __cmp__ compatibility mixin from https://stackoverflow.com/a/39166382/807307 +PY3 = sys.version_info[0] >= 3 +if PY3: + def cmp(a, b): + return (a > b) - (a < b) + # mixin class for Python3 supporting __cmp__ + class PY3__cmp__: + def __eq__(self, other): + return self.__cmp__(other) == 0 + def __ne__(self, other): + return self.__cmp__(other) != 0 + def __gt__(self, other): + return self.__cmp__(other) > 0 + def __lt__(self, other): + return self.__cmp__(other) < 0 + def __ge__(self, other): + return self.__cmp__(other) >= 0 + def __le__(self, other): + return self.__cmp__(other) <= 0 +else: + class PY3__cmp__: + pass + + +class Comment(Content, PY3__cmp__): + mandatory_properties = ('post_id', 'author') + default_template = 'comment' # this is required, but not used + default_status = 'published' + + def __cmp__(self, other): + """ + Comment comparison is by date. This is so that a comment list + can easily be sorted by date. The date attribute will be + automatically set from metadata by Content base class + """ + if self.date == other.date: + return 0 + elif self.date < other.date: + return -1 + else: + return 1 + + def __hash__(self): + return hash((self.post_id, self.author, self.date, self._content)) + + +class CommentReader(object): + def __init__(self, generator): + self._comments = collections.defaultdict(list) + reader = readers.Readers(settings=generator.settings) + + comments_dir = generator.settings.get('COMMENTS_DIR', 'comments') + comment_filenames = generator.get_files(comments_dir) + + for comment_filename in comment_filenames: + comment = reader.read_file( + base_path=generator.settings['PATH'], + path=comment_filename, + content_class=Comment, + context=generator.context) + + if 'post_id' not in comment.metadata: + raise Exception("comment %s does not have a post_id" % ( + comment_filename, )) + self._comments[comment.metadata['post_id']].append(comment) + + """ + libravatar + """ + email = comment.metadata['email'].encode('utf-8') + ahash = hashlib.md5(email.strip().lower()).hexdigest() + comment.avatar = "https://cdn.libravatar.org/avatar/%s" % (ahash) + + for slug, comments in self._comments.items(): + comments.sort() + for n, comment in enumerate(comments): + comment.cid = n + + def get_comments(self, slug): + return self._comments[slug] + +def comment_initialization(generator): + """ + Set up the comment plugin. + """ + generator.plugin_instance = CommentReader(generator) + + +def add_comments(generator, metadata): + metadata["comments"] = generator.plugin_instance.get_comments( + metadata['slug']) + + +def register(): + signals.article_generator_init.connect(comment_initialization) + signals.article_generator_context.connect(add_comments) diff --git a/plugins/pelican_comments/wp2comments b/plugins/pelican_comments/wp2comments new file mode 100644 index 0000000..9e4beab --- /dev/null +++ b/plugins/pelican_comments/wp2comments @@ -0,0 +1,77 @@ +#!/usr/bin/python + +from codecs import open +import sys +import os +from lxml import etree + +COMMENT_DIR='comments' + +def wp2comments(xml): + + #xmlfile = open(xml, encoding='utf-8', mode='r').read() + tree = etree.parse(xml) + root = tree.getroot() + items = root.findall('.//item') + + n = 0 + + if not os.path.exists(COMMENT_DIR): + os.makedirs(COMMENT_DIR) + elif not os.path.isdir(COMMENT_DIR): + print('"%s" exists but is not a directory!' % COMMENT_DIR) + sys.exit(1) + + for item in items: + title = item.find('title') + if title is None: continue + + # Only fetch comments from published posts. + status = item.find('wp:status', namespaces=root.nsmap) + if status is None or status.text != 'publish': + continue + + slug = item.find('wp:post_name', namespaces=root.nsmap) + if slug is None: + print('WARNING: skipping "%s" with no post_name') + continue + slug = slug.text + + comments = item.findall('wp:comment', namespaces=root.nsmap) + if not comments: + # No comments found for this post. + continue + + for comment in comments: + def comment_tag(tag): + result = comment.find(tag, namespaces=root.nsmap) + if result is None: + return '' + else: + return result.text + + status = comment_tag('wp:comment_approved') + if status != '1': + continue + + author = comment_tag('wp:comment_author') + ip = comment_tag('wp:comment_author_IP') + date = comment_tag('wp:comment_date_gmt') + email = comment_tag('wp:comment_author_email') + url = comment_tag('wp:comment_author_url') + content = comment_tag('wp:comment_content') + + n += 1 + f = open(os.path.join(COMMENT_DIR, '%s-%d.md' % (slug, n)), + encoding='utf-8', mode='w') + f.write(u'post_id: %s\n' % (slug, )) + f.write(u'Author: %s\n' % (author, )) + f.write(u'Date: %s\n' % (date, )) + f.write(u'Author_Email: %s\n' % (email, )) + f.write(u'Author_IP: %s\n' % (ip, )) + f.write(u'\n%s\n' % (content, )) + f.close() + + +if __name__ == '__main__': + wp2comments(sys.argv[1])