diff --git a/config/build/create-indexes-feeds b/config/build/create-indexes-feeds index 4204f1a..552e818 100755 --- a/config/build/create-indexes-feeds +++ b/config/build/create-indexes-feeds @@ -29,7 +29,8 @@ end # Formats date in RFC 2822 def format_date date - raw_date = date.gsub(/[\/:]/, ',').gsub(/\s+/, '').split(',') + raw_date = date.gsub(/[\/:]/, ',').gsub(/[\s+|[A-Za-zÁÉÍÓÚÜáéíóúü]+]/, '').split(',') + raw_date = raw_date.reject{|e| e.empty?} par_date = DateTime.new(raw_date[0].to_i, raw_date[1].to_i, raw_date[2].to_i, raw_date[3].to_i, raw_date[4].to_i, raw_date[5].to_i, DateTime.now.to_s[-6..-6] + DateTime.now.to_s[-4..-4]) @@ -53,13 +54,13 @@ Dir.glob('content/html/*').each do |local| .strip date = File.read(f) .gsub(/\n/, '') - .gsub(/^.*?#{$template_lang[locale]['build']}\s+(\d+.+?)\..*$/, '\1') + .gsub(/^.*?#{$template_lang[locale]['published']}\s+([^<]+?)<.*$/, '\1') .strip if title != '' content.push('
' + "\n" + '

' + file.gsub(/_.*$/, '').to_i.to_s + '. ' + title + '

' + "\n" + - '

[' + date + ']

' + "\n" + + '

[' + $template_lang[locale]['published'] + ' ' + date + ']

' + "\n" + '
') end end diff --git a/config/build/pos2htmls b/config/build/pos2htmls index 1978419..5045e61 100755 --- a/config/build/pos2htmls +++ b/config/build/pos2htmls @@ -119,6 +119,7 @@ Dir.glob(po_dir + '*/*.po').each do |po| html_tmp = html_tmp.gsub('@donate', $template_lang[hash['locale']]['donate']) html_tmp = html_tmp.gsub('@copyfarleft', $template_lang[hash['locale']]['copyfarleft']) html_tmp = html_tmp.gsub('@license', $template_lang[hash['locale']]['license']) + html_tmp = html_tmp.gsub('@published', $template_lang[hash['locale']]['published']) html_tmp = html_tmp.gsub('@build', $template_lang[hash['locale']]['build']) html_tmp = html_tmp.gsub('@date', Time.now.strftime('%Y/%m/%d, %H:%M')) diff --git a/config/template/site/main_lang.rb b/config/template/site/main_lang.rb index b63725f..015bb90 100644 --- a/config/template/site/main_lang.rb +++ b/config/template/site/main_lang.rb @@ -9,6 +9,7 @@ $template_lang = { 'copyfarleft' => 'All content is under', 'license' => 'Open and Free Publishing License', 'build' => 'Last build of this page:', + 'published' => 'Published:', }, 'es' => { 'main' => 'Publishing is Coding: Change My Mind', @@ -20,5 +21,6 @@ $template_lang = { 'copyfarleft' => 'Todo el contenido está bajo', 'license' => 'Licencia Editorial Abierta y Libre', 'build' => 'Última modificación de esta página:', + 'published' => 'Publicado:', } } diff --git a/content/html/en/001_free-publishing.html b/content/html/en/001_free-publishing.html index 91a9e4f..0cb7b5b 100644 --- a/content/html/en/001_free-publishing.html +++ b/content/html/en/001_free-publishing.html @@ -26,6 +26,9 @@

From Publishing with Free Software to Free Publishing

+
+

Published: 2019/03/20, 13:00

+

This blog is about “free publishing” but, what does that means? The term “free” it isn't only problematic in English. May be more than in others languages because of the confusion between “free as in beer” and “free as in speech.” But by itself the concept of freedom is so ambiguous than even in Philosophy we are very careful in its use. Even though it is a problem, I like that the term doesn't have a clear definition—at the end, how free could we be if freedom is well defined?

Some years ago, when I started to work hand-in-hand with Programando Libreros and Hacklib, I realized that we weren't just doing publishing with free software. We are doing free publishing. So I attempted to defined it in a post but it doesn't convince me anymore.

The term was floating around until December, 2018. At Contracorriente—yearly fanzine fair celebrated in Xalapa, Mexico—Hacklib and me were invited to give a talk about publishing and free software. Between all of us we made a poster of everything we talked that day.

@@ -57,7 +60,7 @@
diff --git a/content/html/en/index.html b/content/html/en/index.html index 9a73724..2d9b81c 100644 --- a/content/html/en/index.html +++ b/content/html/en/index.html @@ -34,12 +34,12 @@

1. From Publishing with Free Software to Free Publishing

-

[2019/04/14, 13:37]

+

[Published: 2019/03/20, 13:00]

diff --git a/content/html/es/001_free-publishing.html b/content/html/es/001_free-publishing.html index ff9007e..bb5b3d8 100644 --- a/content/html/es/001_free-publishing.html +++ b/content/html/es/001_free-publishing.html @@ -26,6 +26,9 @@

De la edición con software libre a la edición libre

+
+

Publicado: 2019/03/20, 13:00

+

Este blog es acerca de «edición libre» pero ¿qué quiere decir eso? El término «libre» no es tan problemático en nuestra lengua como en el inglés. En ese idioma existe una confusión entre «free» como «barra libre» y como «libre discurso». Sin embargo, eso no elimina el hecho de que el concepto de libertad es tan ambiguo que incluso en Filosofía tratamos de usarlo con cuidado. Aunque sea un problema, prefiero que el término no tenga una definición clara; al final, ¿qué tan libres podríamos ser si la libertad estuviese bien definida?

Hace unos años, cuando empecé a trabajar codo a codo con Programando Libreros y Hacklib, me di cuenta que no solo estábamos editando con software libre. Estamos haciendo edición libre. Así que intenté definirla en una publicación pero ya no me convence.

El término siguió flotando alrededor hasta diciembre del 2018. Durante el Contracorriente —feria anual de fanzine celebrado en Xalapa, México— Hackblib y yo fuimos invitados a dar una charla sobre edición y software libre. Entre todos hicimos una cartulina de lo que hablamos aquel día.

@@ -57,7 +60,7 @@
diff --git a/content/html/es/index.html b/content/html/es/index.html index fd7acfa..592c18c 100644 --- a/content/html/es/index.html +++ b/content/html/es/index.html @@ -34,12 +34,12 @@

1. De la edición con software libre a la edición libre

-

[2019/04/14, 13:37]

+

[Publicado: 2019/03/20, 13:00]

diff --git a/content/po/en/001_free-publishing.po b/content/po/en/001_free-publishing.po index bff6293..a131acd 100644 --- a/content/po/en/001_free-publishing.po +++ b/content/po/en/001_free-publishing.po @@ -7,7 +7,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-04-14 13:36-0500\n" +"PO-Revision-Date: 2019-04-15 10:55-0500\n" "Language-Team: none\n" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -15,7 +15,10 @@ msgstr "" #: content/md/001_free-publishing.js:1 msgid "# From publishing with free software to free publishing" -msgstr "# From Publishing with Free Software to Free Publishing" +msgstr "" +"# From Publishing with Free Software to Free Publishing\n" +"\n" +"> @published 2019/03/20, 13:00 {.published}" #: content/md/001_free-publishing.js:2 msgid "" diff --git a/content/po/es/001_free-publishing.po b/content/po/es/001_free-publishing.po index 50ea642..58b6731 100644 --- a/content/po/es/001_free-publishing.po +++ b/content/po/es/001_free-publishing.po @@ -7,7 +7,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-03-21 16:42-0600\n" +"PO-Revision-Date: 2019-04-15 10:59-0500\n" "Language-Team: none\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -15,7 +15,10 @@ msgstr "" #: content/md/001_free-publishing.js:1 msgid "# From publishing with free software to free publishing" -msgstr "# De la edición con _software_ libre a la edición libre" +msgstr "" +"# De la edición con _software_ libre a la edición libre\n" +"\n" +"> @published 2019/03/20, 13:00 {.published}" #: content/md/001_free-publishing.js:2 msgid "" diff --git a/css/extra.css b/css/extra.css index 17acc5f..8be2df0 100644 --- a/css/extra.css +++ b/css/extra.css @@ -52,6 +52,15 @@ section .post {margin-top: 1em;} section .post p {text-indent: 0;} section .post p:first-child {font-size: 1.15em;} +/* Entry */ + +.published { + margin: 0; + margin-top: -1.5em; + margin-bottom: 1.5em; + font-size: .85em; +} + /* Footer */ footer {margin-top: 50px;} diff --git a/feed/en/rss.xml b/feed/en/rss.xml index 164f0ce..005e42f 100644 --- a/feed/en/rss.xml +++ b/feed/en/rss.xml @@ -7,7 +7,7 @@ Blog about free culture, free software and free publishing. en hi@perrotuerto.blog (Nika Zhenya) - Sun, 14 Apr 2019 13:37:00 -0500 + Mon, 15 Apr 2019 10:59:00 -0500 Publishing is Coding: Change My Mind https://perrotuerto.blog/icon.png @@ -16,7 +16,7 @@ 1. From Publishing with Free Software to Free Publishing https://perrotuerto.blog/content/html/en/001_free-publishing.html - Sun, 14 Apr 2019 13:37:00 -0500 + Wed, 20 Mar 2019 13:00:00 -0500 guid1 diff --git a/feed/es/rss.xml b/feed/es/rss.xml index e8cf299..2a76eb3 100644 --- a/feed/es/rss.xml +++ b/feed/es/rss.xml @@ -7,7 +7,7 @@ Blog about free culture, free software and free publishing. es hi@perrotuerto.blog (Nika Zhenya) - Sun, 14 Apr 2019 13:37:00 -0500 + Mon, 15 Apr 2019 10:59:00 -0500 Publishing is Coding: Change My Mind https://perrotuerto.blog/icon.png @@ -16,7 +16,7 @@ 1. De la edición con <i>software</i> libre a la edición libre https://perrotuerto.blog/content/html/es/001_free-publishing.html - Sun, 14 Apr 2019 13:37:00 -0500 + Wed, 20 Mar 2019 13:00:00 -0500 guid1