diff options
38 files changed, 136 insertions, 47 deletions
@@ -271,8 +271,8 @@ $(indexes.htmllisting): $(categories.htmllisting): mkwb categoriesbody $*.conf > $@ -$(categories.txt): - mkwb categories $(@D) > $@ +$(categories.txt): src/global.conf + mkwb categories src/global.conf $(@D) > $@ $(categories.xml): for f in `cat $*.txt`; do \ @@ -311,12 +311,6 @@ src/content/en/til/categories.snippets.gz: src/content/en/til/categories.snippet src/content/pt/hea/categorias.snippets.gz: src/content/pt/hea/categorias.snippets src/content/en/slide/2020/10/19/feature-flags.pdf.gz: src/content/en/slide/2020/10/19/feature-flags.pdf src/content/en/slide/2020/11/14/local-first-hype.pdf.gz: src/content/en/slide/2020/11/14/local-first-hype.pdf -src/content/en/blog/categories.xml.gz: src/content/en/blog/categories.xml -src/content/en/pastebin/categories.xml.gz: src/content/en/pastebin/categories.xml -src/content/en/podcast/categories.xml.gz: src/content/en/podcast/categories.xml -src/content/en/screencast/categories.xml.gz: src/content/en/screencast/categories.xml -src/content/en/til/categories.xml.gz: src/content/en/til/categories.xml -src/content/pt/hea/categories.xml.gz: src/content/pt/hea/categories.xml src/content/en/blog/feed.xml.gz: src/content/en/blog/feed.xml src/content/en/pastebin/feed.xml.gz: src/content/en/pastebin/feed.xml src/content/en/podcast/feed.xml.gz: src/content/en/podcast/feed.xml @@ -1015,6 +1009,7 @@ src/content/en/blog/index.htmllisting src/content/en/blog/categories.htmllisting src/content/en/blog/categories.txt: $(articles.en.blog.categorydata) src/content/en/blog/categories.txt src/content/en/blog/feed.xml: $(articles.en.blog.feedentry) src/content/en/blog/categories.htmllisting src/content/en/blog/categories.xml: src/content/en/blog/categories.txt +src/content/en/blog/categories.xml.gz: src/content/en/blog/categories.xml articles.en.pastebin.adoc = \ @@ -1060,6 +1055,7 @@ src/content/en/pastebin/index.htmllisting src/content/en/pastebin/categories.htm src/content/en/pastebin/categories.txt: $(articles.en.pastebin.categorydata) src/content/en/pastebin/categories.txt src/content/en/pastebin/feed.xml: $(articles.en.pastebin.feedentry) src/content/en/pastebin/categories.htmllisting src/content/en/pastebin/categories.xml: src/content/en/pastebin/categories.txt +src/content/en/pastebin/categories.xml.gz: src/content/en/pastebin/categories.xml articles.en.podcast.adoc = \ @@ -1084,6 +1080,7 @@ src/content/en/podcast/index.htmllisting src/content/en/podcast/categories.htmll src/content/en/podcast/categories.txt: $(articles.en.podcast.categorydata) src/content/en/podcast/categories.txt src/content/en/podcast/feed.xml: $(articles.en.podcast.feedentry) src/content/en/podcast/categories.htmllisting src/content/en/podcast/categories.xml: src/content/en/podcast/categories.txt +src/content/en/podcast/categories.xml.gz: src/content/en/podcast/categories.xml articles.en.screencast.adoc = \ @@ -1108,6 +1105,7 @@ src/content/en/screencast/index.htmllisting src/content/en/screencast/categories src/content/en/screencast/categories.txt: $(articles.en.screencast.categorydata) src/content/en/screencast/categories.txt src/content/en/screencast/feed.xml: $(articles.en.screencast.feedentry) src/content/en/screencast/categories.htmllisting src/content/en/screencast/categories.xml: src/content/en/screencast/categories.txt +src/content/en/screencast/categories.xml.gz: src/content/en/screencast/categories.xml articles.en.til.adoc = \ @@ -1154,6 +1152,7 @@ src/content/en/til/index.htmllisting src/content/en/til/categories.htmllisting: src/content/en/til/categories.txt: $(articles.en.til.categorydata) src/content/en/til/categories.txt src/content/en/til/feed.xml: $(articles.en.til.feedentry) src/content/en/til/categories.htmllisting src/content/en/til/categories.xml: src/content/en/til/categories.txt +src/content/en/til/categories.xml.gz: src/content/en/til/categories.xml articles.pt.hea.adoc = \ @@ -1170,11 +1169,12 @@ src/content/pt/hea/feed.xml: src/content/pt/hea/sortdata.txt src/content/pt/hea/feed.xml: $(articles.pt.hea.sortdata) src/content/pt/hea/index.htmllisting: src/content/pt/hea/sortdata.txt src/content/pt/hea/index.htmllisting: $(articles.pt.hea.sortdata) -src/content/pt/hea/categories.htmllisting: src/content/pt/hea/sortdata.txt -src/content/pt/hea/categories.htmllisting: $(articles.pt.hea.sortdata) -src/content/pt/hea/categories.txt: src/content/pt/hea/sortdata.txt -src/content/pt/hea/categories.txt: $(articles.pt.hea.sortdata) -src/content/pt/hea/index.htmllisting src/content/pt/hea/categories.htmllisting: $(articles.pt.hea.indexentry) -src/content/pt/hea/categories.txt: $(articles.pt.hea.categorydata) -src/content/pt/hea/categories.txt src/content/pt/hea/feed.xml: $(articles.pt.hea.feedentry) -src/content/pt/hea/categories.htmllisting src/content/pt/hea/categories.xml: src/content/pt/hea/categories.txt +src/content/pt/hea/categorias.htmllisting: src/content/pt/hea/sortdata.txt +src/content/pt/hea/categorias.htmllisting: $(articles.pt.hea.sortdata) +src/content/pt/hea/categorias.txt: src/content/pt/hea/sortdata.txt +src/content/pt/hea/categorias.txt: $(articles.pt.hea.sortdata) +src/content/pt/hea/index.htmllisting src/content/pt/hea/categorias.htmllisting: $(articles.pt.hea.indexentry) +src/content/pt/hea/categorias.txt: $(articles.pt.hea.categorydata) +src/content/pt/hea/categorias.txt src/content/pt/hea/feed.xml: $(articles.pt.hea.feedentry) +src/content/pt/hea/categorias.htmllisting src/content/pt/hea/categorias.xml: src/content/pt/hea/categorias.txt +src/content/pt/hea/categorias.xml.gz: src/content/pt/hea/categorias.xml @@ -9,23 +9,23 @@ normalize() { } pages() { - find src/pages/*/*.adoc -type f | normalize + find src/pages/*/*.adoc -type f | normalize } articles() { - find src/collections/*/*/*/ -type f -name '*.adoc' | normalize + find src/collections/*/*/*/ -type f -name '*.adoc' | normalize } slides() { - find src/slides/*/*/ -type f -name '*.adoc' | normalize + find src/slides/*/*/ -type f -name '*.adoc' | normalize } indexes() { - find src/collections/*/*/index.adoc | normalize + find src/collections/*/*/index.adoc | normalize } categories() { - find src/collections/*/*/categories.name | normalize + grep -l '^:type: categories$' src/collections/*/*/*.adoc | normalize } media() { @@ -81,7 +81,6 @@ cat po/po4a.cfg | files | sed 's/^\(.*\)\.adoc$/\1.html/' files | sed 's/^\(.*\)\.adoc$/\1.snippets/' slides | sed 's/^\(.*\)\.adoc$/\1.pdf/' - indexes | sed 's|^\(.*\)/index\.adoc$|\1/categories.xml|' indexes | sed 's|^\(.*\)/index\.adoc$|\1/feed.xml|' } | sed 's/^\(.*\)$/\1.gz:\t\1/' printf '\n' @@ -120,6 +119,7 @@ collectionentries() { colllink="$2" lang="$(basename "$langlink")" c="$(printf '%s' "$colllink" | normalize)" + plural="$(cat src/names/categories/"$lang".txt)" printf '\n\n' name="$(basename "$c")" @@ -130,35 +130,36 @@ collectionentries() { echo "$art.$name.feedentry = \$($art.$name.adoc:.adoc=.feedentry)" echo "$art.$name.categorydata = \$($art.$name.adoc:.adoc=.categorydata)" - printf '%s/sortdata.txt:\tdeps.mk\n' "$c" printf '\tprintf %s $(%s.%s.sortdata) > $@\n\n' "'%s\n'" "$art" "$name" - listings=' + listings=" feed.xml index.htmllisting - categories.htmllisting - categories.txt - ' + $plural.htmllisting + $plural.txt + " for lst in $listings; do printf '%s/%s:\t%s/sortdata.txt\n' "$c" "$lst" "$c" printf '%s/%s:\t$(%s.%s.sortdata)\n' "$c" "$lst" "$art" "$name" done printf '%s/index.htmllisting\t' "$c" - printf '%s/categories.htmllisting:\t' "$c" + printf '%s/%s.htmllisting:\t' "$c" "$plural" printf '$(%s.%s.indexentry)\n' "$art" "$name" - printf '%s/categories.txt:\t' "$c" + printf '%s/%s.txt:\t' "$c" "$plural" printf '$(%s.%s.categorydata)\n' "$art" "$name" - printf '%s/categories.txt\t' "$c" + printf '%s/%s.txt\t' "$c" "$plural" printf '%s/feed.xml:\t' "$c" printf '$(%s.%s.feedentry)\n' "$art" "$name" - printf '%s/categories.htmllisting\t' "$c" - printf '%s/categories.xml:\t' "$c" - printf '%s/categories.txt\n' "$c" + printf '%s/%s.htmllisting\t' "$c" "$plural" + printf '%s/%s.xml:\t' "$c" "$plural" + printf '%s/%s.txt\n' "$c" "$plural" + + printf '%s/%s.xml.gz:\t%s/%s.xml\n' "$c" "$plural" "$c" "$plural" } @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" "PO-Revision-Date: 2025-04-29 19:46-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,6 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" "PO-Revision-Date: 2025-04-29 19:46-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,6 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" "PO-Revision-Date: 2025-04-29 19:46-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,6 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" "PO-Revision-Date: 2025-04-29 19:46-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,6 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap diff --git a/po/euandre.org.pot b/po/euandre.org.pot index 160d9c3..a2f2acb 100644 --- a/po/euandre.org.pot +++ b/po/euandre.org.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,6 +16,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" "PO-Revision-Date: 2025-04-29 19:46-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,6 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap diff --git a/po/po4a.cfg b/po/po4a.cfg index d4efb52..9b34560 100644 --- a/po/po4a.cfg +++ b/po/po4a.cfg @@ -2,6 +2,9 @@ [po_directory] po +[type: text] src/names/categories/ref.txt $lang:src/names/categories/$lang.txt +[type: text] src/names/category/ref.txt $lang:src/names/category/$lang.txt + [type: asciidoc] src/content/en/about.adoc pt:src/content/pt/sobre.adoc add_$lang:po/note.txt [type: asciidoc] src/content/en/til/index.adoc pt:src/content/pt/hea/index.adoc add_$lang:po/note.txt [type: asciidoc] src/content/en/til/categories.adoc pt:src/content/pt/hea/categorias.adoc add_$lang:po/note.txt @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2025-04-30 07:24-0300\n" -"PO-Revision-Date: 2025-04-30 07:25-0300\n" +"POT-Creation-Date: 2025-05-01 13:10-0300\n" +"PO-Revision-Date: 2025-05-01 13:32-0300\n" "Last-Translator: EuAndreh <eu@euandre.org>\n" "Language-Team: none\n" "Language: pt\n" @@ -17,6 +17,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.5\n" +#. type: Plain text +#: src/names/categories/ref.txt:1 +msgid "categories" +msgstr "categorias" + +#. type: Plain text +#: src/names/category/ref.txt:1 +msgid "category" +msgstr "categoria" + #. type: Title = #: src/content/en/about.adoc:1 #, no-wrap diff --git a/src/content/en/blog/categories.adoc b/src/content/en/blog/categories.adoc index f29acda..feb64ff 100644 --- a/src/content/en/blog/categories.adoc +++ b/src/content/en/blog/categories.adoc @@ -1 +1,2 @@ = Articles by category +:type: categories diff --git a/src/content/en/blog/categories.name b/src/content/en/blog/categories.name deleted file mode 120000 index df691ee..0000000 --- a/src/content/en/blog/categories.name +++ /dev/null @@ -1 +0,0 @@ -categories.adoc
\ No newline at end of file diff --git a/src/content/en/pastebin/categories.adoc b/src/content/en/pastebin/categories.adoc index f29acda..feb64ff 100644 --- a/src/content/en/pastebin/categories.adoc +++ b/src/content/en/pastebin/categories.adoc @@ -1 +1,2 @@ = Articles by category +:type: categories diff --git a/src/content/en/pastebin/categories.name b/src/content/en/pastebin/categories.name deleted file mode 120000 index df691ee..0000000 --- a/src/content/en/pastebin/categories.name +++ /dev/null @@ -1 +0,0 @@ -categories.adoc
\ No newline at end of file diff --git a/src/content/en/podcast/categories.adoc b/src/content/en/podcast/categories.adoc index f29acda..feb64ff 100644 --- a/src/content/en/podcast/categories.adoc +++ b/src/content/en/podcast/categories.adoc @@ -1 +1,2 @@ = Articles by category +:type: categories diff --git a/src/content/en/podcast/categories.name b/src/content/en/podcast/categories.name deleted file mode 120000 index df691ee..0000000 --- a/src/content/en/podcast/categories.name +++ /dev/null @@ -1 +0,0 @@ -categories.adoc
\ No newline at end of file diff --git a/src/content/en/screencast/categories.adoc b/src/content/en/screencast/categories.adoc index f29acda..feb64ff 100644 --- a/src/content/en/screencast/categories.adoc +++ b/src/content/en/screencast/categories.adoc @@ -1 +1,2 @@ = Articles by category +:type: categories diff --git a/src/content/en/screencast/categories.name b/src/content/en/screencast/categories.name deleted file mode 120000 index df691ee..0000000 --- a/src/content/en/screencast/categories.name +++ /dev/null @@ -1 +0,0 @@ -categories.adoc
\ No newline at end of file diff --git a/src/content/en/til/categories.adoc b/src/content/en/til/categories.adoc index f29acda..feb64ff 100644 --- a/src/content/en/til/categories.adoc +++ b/src/content/en/til/categories.adoc @@ -1 +1,2 @@ = Articles by category +:type: categories diff --git a/src/content/en/til/categories.name b/src/content/en/til/categories.name deleted file mode 120000 index df691ee..0000000 --- a/src/content/en/til/categories.name +++ /dev/null @@ -1 +0,0 @@ -categories.adoc
\ No newline at end of file diff --git a/src/content/pt/hea/categorias.adoc b/src/content/pt/hea/categorias.adoc index 5ef54e2..19e7cb7 100644 --- a/src/content/pt/hea/categorias.adoc +++ b/src/content/pt/hea/categorias.adoc @@ -1,4 +1,5 @@ = Artigos por categoria +:type: categories diff --git a/src/content/pt/hea/categories.name b/src/content/pt/hea/categories.name deleted file mode 120000 index 1b27816..0000000 --- a/src/content/pt/hea/categories.name +++ /dev/null @@ -1 +0,0 @@ -categorias.adoc
\ No newline at end of file diff --git a/src/names/categories/de.txt b/src/names/categories/de.txt new file mode 100644 index 0000000..36e8f75 --- /dev/null +++ b/src/names/categories/de.txt @@ -0,0 +1 @@ +categories diff --git a/src/names/categories/en.txt b/src/names/categories/en.txt new file mode 100644 index 0000000..36e8f75 --- /dev/null +++ b/src/names/categories/en.txt @@ -0,0 +1 @@ +categories diff --git a/src/names/categories/eo.txt b/src/names/categories/eo.txt new file mode 100644 index 0000000..36e8f75 --- /dev/null +++ b/src/names/categories/eo.txt @@ -0,0 +1 @@ +categories diff --git a/src/names/categories/es.txt b/src/names/categories/es.txt new file mode 100644 index 0000000..36e8f75 --- /dev/null +++ b/src/names/categories/es.txt @@ -0,0 +1 @@ +categories diff --git a/src/names/categories/fr.txt b/src/names/categories/fr.txt new file mode 100644 index 0000000..36e8f75 --- /dev/null +++ b/src/names/categories/fr.txt @@ -0,0 +1 @@ +categories diff --git a/src/names/categories/pt.txt b/src/names/categories/pt.txt new file mode 100644 index 0000000..7216072 --- /dev/null +++ b/src/names/categories/pt.txt @@ -0,0 +1 @@ +categorias diff --git a/src/names/categories/ref.txt b/src/names/categories/ref.txt new file mode 100644 index 0000000..36e8f75 --- /dev/null +++ b/src/names/categories/ref.txt @@ -0,0 +1 @@ +categories diff --git a/src/names/category/de.txt b/src/names/category/de.txt new file mode 100644 index 0000000..46e72f3 --- /dev/null +++ b/src/names/category/de.txt @@ -0,0 +1 @@ +category diff --git a/src/names/category/en.txt b/src/names/category/en.txt new file mode 100644 index 0000000..46e72f3 --- /dev/null +++ b/src/names/category/en.txt @@ -0,0 +1 @@ +category diff --git a/src/names/category/eo.txt b/src/names/category/eo.txt new file mode 100644 index 0000000..46e72f3 --- /dev/null +++ b/src/names/category/eo.txt @@ -0,0 +1 @@ +category diff --git a/src/names/category/es.txt b/src/names/category/es.txt new file mode 100644 index 0000000..46e72f3 --- /dev/null +++ b/src/names/category/es.txt @@ -0,0 +1 @@ +category diff --git a/src/names/category/fr.txt b/src/names/category/fr.txt new file mode 100644 index 0000000..46e72f3 --- /dev/null +++ b/src/names/category/fr.txt @@ -0,0 +1 @@ +category diff --git a/src/names/category/pt.txt b/src/names/category/pt.txt new file mode 100644 index 0000000..ae2c934 --- /dev/null +++ b/src/names/category/pt.txt @@ -0,0 +1 @@ +categoria diff --git a/src/names/category/ref.txt b/src/names/category/ref.txt new file mode 100644 index 0000000..46e72f3 --- /dev/null +++ b/src/names/category/ref.txt @@ -0,0 +1 @@ +category diff --git a/src/static.conf b/src/static.conf index 1007780..6a36518 100644 --- a/src/static.conf +++ b/src/static.conf @@ -1,3 +1,4 @@ +export names_dir=src/names export root_dir=src/content export header_links=src/headers.txt export list_addr='~euandreh/public-inbox@lists.sr.ht' |