From e352345d44becd2e42c3cd9492be198a967619f6 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 10 Mar 2024 22:07:41 -0300 Subject: [PATCH 01/12] Add links to available hidden services (#3) --- src/en/services.md | 4 ++-- src/pt/services.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/en/services.md b/src/en/services.md index b998007..bba2440 100644 --- a/src/en/services.md +++ b/src/en/services.md @@ -12,13 +12,13 @@ By using these services, you agree to the [luca0N.com Terms of Service](tos). These services are either private, have limited access or are invite-only. -- [luca0N.com Git](https://git.luca0n.com/): this is where I host the source code for my software. +- [luca0N.com Git](https://git.luca0n.com/)[Tor]: this is where I host the source code for my software. - [luca0N! Social](https://social.luca0n.com/): this is my self\-hosted Pleroma instance (although I rarely use it). - [Matrix](https://matrix.luca0n.com/): my self-hosted Matrix instance. # Apps -- [Element](https://element.luca0n.com/): an Element web client instance. +- [Element](https://element.luca0n.com/)[Tor]: an Element web client instance. # APIs diff --git a/src/pt/services.md b/src/pt/services.md index 2d9b3b1..664b903 100644 --- a/src/pt/services.md +++ b/src/pt/services.md @@ -13,13 +13,13 @@ Ao utilizar estes serviços, você concorda com os [Termos de Serviço luca0N.co Estes serviços são privados, de acesso limitado ou apenas para convidados. -- [Git luca0N.com](https://git.luca0n.com/): o código-fonte dos meus programas ficam aqui. +- [Git luca0N.com](https://git.luca0n.com/)[Tor]: o código-fonte dos meus programas ficam aqui. - [luca0N! Social](https://social.luca0n.com/): é a minha instância do Pleroma (apesar de eu não utilizar ela muito). - [Matrix](https://matrix.luca0n.com/): é meu servidor Matrix. # Aplicativos -- [Element](https://element.luca0n.com/): é uma instância do cliente *web* Element. +- [Element](https://element.luca0n.com/)[Tor]: é uma instância do cliente *web* Element. # APIs From c59416baf860a28823695757b133e118b4f76664 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 10 Mar 2024 22:08:20 -0300 Subject: [PATCH 02/12] Bump copyright year --- src/en/__swg_template.html | 2 +- src/pt/__swg_template.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/en/__swg_template.html b/src/en/__swg_template.html index bb48bc5..3544129 100644 --- a/src/en/__swg_template.html +++ b/src/en/__swg_template.html @@ -63,7 +63,7 @@

This website is hosted on Nautilus. Privacy Notice | Terms of Service

All content on this webpage—including the luca0N! icon—is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license unless otherwise stated.

-

Copyright © 2020—2023 luca0N! Some rights reserved.

+

Copyright © 2020—2024 luca0N! Some rights reserved.

diff --git a/src/pt/__swg_template.html b/src/pt/__swg_template.html index 4e43452..d099b75 100644 --- a/src/pt/__swg_template.html +++ b/src/pt/__swg_template.html @@ -63,7 +63,7 @@

Este sítio está hospedado em Nautilus. Declaração de Privacidade | Termos de Serviço

Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada.

-

Copyright © 2020—2023 luca0N! Alguns direitos reservados.

+

Copyright © 2020—2024 luca0N! Alguns direitos reservados.

From 520cda7e8dcc78d5bab8f4e521c38ba080819750 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 10 Mar 2024 22:11:27 -0300 Subject: [PATCH 03/12] Update copyright years in README and swg.cfg --- README.md | 2 +- src/en/swg.cfg | 4 ++-- src/pt/swg.cfg | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9560db1..5989282 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository contains all sources for the third revision of the luca0N.com we ## License and copyright notice -Copyright © 2020—2023 luca0N! Some rights reserved. +Copyright © 2020—2024 luca0N! Some rights reserved. The contents of the luca0N!.com website are licensed under the Attribution-ShareAlike 4.0 International license unless otherwise stated. See [COPYRIGHT](COPYRIGHT) and [LICENSE](LICENSE) for more information. diff --git a/src/en/swg.cfg b/src/en/swg.cfg index aad5948..19bbb72 100644 --- a/src/en/swg.cfg +++ b/src/en/swg.cfg @@ -1,5 +1,5 @@ # SWG Context Configuration File -# Copyright (C) 2023 luca0N! +# Copyright (C) 2022-2024 luca0N! # This is a very minimal .ini-like configuration file. # @@ -24,7 +24,7 @@ WebsitePublisher="luca0N!" # published on the website. Multiple copyright holders can be specified here. WebsiteCopyrightHolder="luca0N!" # This defines the copyright year or copyright years of the published content. -WebsiteCopyrightYears="2020-2023" +WebsiteCopyrightYears="2020—2024" # This defines the license of the published content. WebsiteContentLicense="CC-BY-SA-4.0" diff --git a/src/pt/swg.cfg b/src/pt/swg.cfg index 403a664..35127ba 100644 --- a/src/pt/swg.cfg +++ b/src/pt/swg.cfg @@ -1,5 +1,5 @@ # SWG Context Configuration File -# Copyright (C) 2023 luca0N! +# Copyright (C) 2022-2024 luca0N! # This is a very minimal .ini-like configuration file. # @@ -24,7 +24,7 @@ WebsitePublisher="luca0N!" # published on the website. Multiple copyright holders can be specified here. WebsiteCopyrightHolder="luca0N!" # This defines the copyright year or copyright years of the published content. -WebsiteCopyrightYears="2020-2023" +WebsiteCopyrightYears="2020—2024" # This defines the license of the published content. WebsiteContentLicense="CC-BY-SA-4.0" From 299cfca3ddf29c76fba417a490c2b3a8cc048451 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Thu, 14 Mar 2024 00:28:30 -0300 Subject: [PATCH 04/12] Add link to GitHub profile and update IRC info --- src/en/contact.md | 9 ++++++++- src/pt/contact.md | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/en/contact.md b/src/en/contact.md index 8d66825..438c5de 100644 --- a/src/en/contact.md +++ b/src/en/contact.md @@ -5,5 +5,12 @@ Want to get in touch with me? Here's my contact details (feel free to use any o - E-mail Address: `luca0n at luca0n dot com` ([PGP encryption](pgp/) is encouraged) - XMPP (Jabber) Address: (same as e-mail address) - Matrix Address: `@luca0n:luca0n.com` -- IRC: `luca0N` on Libera.Chat (though 99% of the time I'm just lurking in various channels) +- IRC: `luca0N` on Libera.Chat (I'm a bit more active there these days) - Pleroma (ActivityPub, Fediverse): `at luca0n at luca0n dot com` + +## Extras + +These are accounts that I have, but don't consider my main ones: + +- GitHub: [@luca0N](https://github.com/luca0N) (I am actually on GitHub solely to contribute to FOSS projects hosted on there, but my software stays in [my Git server](https://git.luca0n.com/luca0N). + diff --git a/src/pt/contact.md b/src/pt/contact.md index 1e4b5d9..abe7db7 100644 --- a/src/pt/contact.md +++ b/src/pt/contact.md @@ -5,5 +5,12 @@ Deseja entrar em contato comigo? Aqui estão os meus detalhes de contato (sinta- - Endereço de correio eletrônico: `luca0n arroba luca0n ponto com` ([criptografia PGP](pgp/) é recomendado) - Endereço XMPP (Jabber): (o mesmo que o endereço de correio eletrônico) - Endereço Matrix: `@luca0n:luca0n.com` -- IRC: `luca0N` no Libera.Chat (apesar de eu estar inativo 99% das vezes na maioria dos canais) +- IRC: `luca0N` no Libera.Chat (eu estive mais ativo recentemente) - Pleroma (ActivityPub, Fediverse): `arroba luca0n arroba luca0n ponto com` + +## Extras + +Estas são contas que eu tenho, mas não considero minhas principais: + +- GitHub: [@luca0N](https://github.com/luca0N) (Eu estou no GitHub somente para contribuir para projetos FOSS que estão lá, mas meu software continua no [meu servidor Git](https://git.luca0n.com/luca0N). + From 4025da1f9ac93855f46345c67d4624333c289c7c Mon Sep 17 00:00:00 2001 From: luca0N! Date: Thu, 14 Mar 2024 00:32:40 -0300 Subject: [PATCH 05/12] Update broken outdated repo link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5989282..da9d27b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Here are the instructions to build this website. It should work on any system, ### Requirements -- [swg](https://git.luca0n.com/swg.git) +- [swg](https://git.luca0n.com/luca0N/swg) ### Building From f9749e44ff1328d174f6300bb8ef53ffd0b75190 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:08:06 -0300 Subject: [PATCH 06/12] Add rules for individual localized sources --- Makefile | 10 +++++++++- README.md | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f15f19b..4ff2856 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,17 @@ SWG=swg -all: output/ +all: output/en/ output/pt/ + +en: output/en/ + +pt: output/pt/ + +output/en/: src/en/ $(SWG) src/en/ mv src/en/output output/en + +output/pt/: src/pt/ $(SWG) src/pt/ mv src/pt/output output/pt diff --git a/README.md b/README.md index da9d27b..7ff9e40 100644 --- a/README.md +++ b/README.md @@ -27,3 +27,8 @@ To delete previously built pages, run the following command: ```sh $ make clean ``` + +You can also build the English version only with: +```sh +$ make en # or use `pt' to build Portuguese sources +``` From a1da0f4dc5ee54b2890e14411067d6d3e9d0005d Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:40:06 -0300 Subject: [PATCH 07/12] Escape square brackets --- src/en/services.md | 4 ++-- src/pt/services.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/en/services.md b/src/en/services.md index bba2440..50b5661 100644 --- a/src/en/services.md +++ b/src/en/services.md @@ -12,13 +12,13 @@ By using these services, you agree to the [luca0N.com Terms of Service](tos). These services are either private, have limited access or are invite-only. -- [luca0N.com Git](https://git.luca0n.com/)[Tor]: this is where I host the source code for my software. +- [luca0N.com Git](https://git.luca0n.com/)\[Tor\]: this is where I host the source code for my software. - [luca0N! Social](https://social.luca0n.com/): this is my self\-hosted Pleroma instance (although I rarely use it). - [Matrix](https://matrix.luca0n.com/): my self-hosted Matrix instance. # Apps -- [Element](https://element.luca0n.com/)[Tor]: an Element web client instance. +- [Element](https://element.luca0n.com/)\[Tor\]: an Element web client instance. # APIs diff --git a/src/pt/services.md b/src/pt/services.md index 664b903..081ab65 100644 --- a/src/pt/services.md +++ b/src/pt/services.md @@ -13,13 +13,13 @@ Ao utilizar estes serviços, você concorda com os [Termos de Serviço luca0N.co Estes serviços são privados, de acesso limitado ou apenas para convidados. -- [Git luca0N.com](https://git.luca0n.com/)[Tor]: o código-fonte dos meus programas ficam aqui. +- [Git luca0N.com](https://git.luca0n.com/)\[Tor\]: o código-fonte dos meus programas ficam aqui. - [luca0N! Social](https://social.luca0n.com/): é a minha instância do Pleroma (apesar de eu não utilizar ela muito). - [Matrix](https://matrix.luca0n.com/): é meu servidor Matrix. # Aplicativos -- [Element](https://element.luca0n.com/)[Tor]: é uma instância do cliente *web* Element. +- [Element](https://element.luca0n.com/)\[Tor\]: é uma instância do cliente *web* Element. # APIs From cc440900b93a17153b110df4706fd07312f38b83 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:41:15 -0300 Subject: [PATCH 08/12] Add required dependency in rule Add a directory creation dependency in the l10n rules to prevent the `mv' commands from failing. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4ff2856..537b2ee 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ en: output/en/ pt: output/pt/ -output/en/: src/en/ +output/en/: output/ src/en/ $(SWG) src/en/ mv src/en/output output/en -output/pt/: src/pt/ +output/pt/: output/ src/pt/ $(SWG) src/pt/ mv src/pt/output output/pt From 19fc8d9a0a02697a17e5042fc33c9b935bf3f7e5 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:54:47 -0300 Subject: [PATCH 09/12] Update page background color Update the page background color in the main CSS file for better contrast and easier reading. --- src/en/assets/luca0n.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/en/assets/luca0n.css b/src/en/assets/luca0n.css index a7bf6a8..73630d4 100644 --- a/src/en/assets/luca0n.css +++ b/src/en/assets/luca0n.css @@ -9,7 +9,7 @@ body { margin: 0; font-family: sans-serif; - background-color: #ddd; + background-color: #eee; color: #333; } From b7fc7a96d5fee626f4d19212c8d0bd4aae0dc798 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:57:26 -0300 Subject: [PATCH 10/12] Link website repository in the footer --- src/en/__swg_template.html | 2 +- src/pt/__swg_template.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/en/__swg_template.html b/src/en/__swg_template.html index 3544129..deadada 100644 --- a/src/en/__swg_template.html +++ b/src/en/__swg_template.html @@ -62,7 +62,7 @@

This website is hosted on Nautilus. Privacy Notice | Terms of Service

-

All content on this webpage—including the luca0N! icon—is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license unless otherwise stated.

+

All content on this webpage—including the luca0N! icon—is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license unless otherwise stated. [View website sources]

Copyright © 2020—2024 luca0N! Some rights reserved.

diff --git a/src/pt/__swg_template.html b/src/pt/__swg_template.html index d099b75..61f11f7 100644 --- a/src/pt/__swg_template.html +++ b/src/pt/__swg_template.html @@ -62,7 +62,7 @@

Este sítio está hospedado em Nautilus. Declaração de Privacidade | Termos de Serviço

-

Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada.

+

Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada. [Ver fontes deste sítio]

Copyright © 2020—2024 luca0N! Alguns direitos reservados.

From 10f34f7f9a94f16f634bd86a6be08725c21f5233 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:58:29 -0300 Subject: [PATCH 11/12] Update repository link --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 537b2ee..538137b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # luca0N.com website sources Makefile # 2022-09-12 -# https://git.luca0n.com/luca0N-website.git +# https://git.luca0n.com/luca0N/luca0N-website SWG=swg From 355390c64abd39b8fdd0963e8de9a1b5a3f65091 Mon Sep 17 00:00:00 2001 From: luca0N! Date: Sun, 17 Mar 2024 14:59:46 -0300 Subject: [PATCH 12/12] Bump copyright year --- COPYRIGHT | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/COPYRIGHT b/COPYRIGHT index 04023b1..c2c9f35 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,9 @@ -Copyright (C) 2020-2023 luca0N! Some rights reserved. +Copyright (C) 2020-2024 luca0N! Some rights reserved. All content on the luca0N!.com website - including the luca0N! logo - is licensed under the Attribution-ShareAlike 4.0 International license unless otherwise stated. See LICENSE for more information. +Updates sources for this website are available at +. +