From 362d313155b6182b9b687f907754bc6df45c409c Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:43:39 +0300 Subject: [PATCH 01/18] feat(i18n): add contributor call-to-action for current edition in (en) --- src/templates/en/base.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/templates/en/base.html b/src/templates/en/base.html index ee1c0382933..3be0c09aef0 100644 --- a/src/templates/en/base.html +++ b/src/templates/en/base.html @@ -24,6 +24,11 @@ You’re viewing a previous edition of the Web Almanac. Check out the {{ DEFAULT_YEAR }} edition!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Call for Contributors: Help create the Web Almanac 2025 and be part of the team shaping this year’s edition! +

{%- endif -%} {% endblock %} From 89cc2e93f7e6521b742ed7f2bc13e07bed3eaa42 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:44:31 +0300 Subject: [PATCH 02/18] feat(i18n): add contributor call-to-action for current edition in (es) --- src/templates/es/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/es/base.html b/src/templates/es/base.html index 7da14064ba8..f21aa40d0a8 100644 --- a/src/templates/es/base.html +++ b/src/templates/es/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Estás viendo una edición anterior del Web Almanac. ¡Consulta a edición de {{ DEFAULT_YEAR }}!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Convocatoria para colaboradores: ¡Ayuda a crear el Web Almanac 2025 y forma parte del equipo que da forma a la edición de este año! +

{%- endif -%} {% endblock %} From 6edeea230a9b39082ec169dd59ec6ee8a6e0bdcc Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:46:24 +0300 Subject: [PATCH 03/18] feat(i18n): add contributor call-to-action for current edition in (fr) --- src/templates/fr/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/fr/base.html b/src/templates/fr/base.html index 67174b0011a..a98dd37febe 100644 --- a/src/templates/fr/base.html +++ b/src/templates/fr/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Vous consultez une édition précédente du Web Almanac. Découvrez l’édition {{ DEFAULT_YEAR }}!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Appel à contributions: Aidez à créer le Web Almanac 2025 et faites partie de l’équipe qui façonne l’édition de cette année ! +

{%- endif -%} {% endblock %} From 9e9c1a8acbdd008994913be19d66005fe6fb8244 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:49:24 +0300 Subject: [PATCH 04/18] feat(i18n): add contributor call-to-action for current edition in (hi) --- src/templates/hi/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/hi/base.html b/src/templates/hi/base.html index b7927cfd840..9254b99313c 100644 --- a/src/templates/hi/base.html +++ b/src/templates/hi/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

आप वेब पंचांग का पिछला संस्करण देख रहे हैं। {{ DEFAULT_YEAR }} संस्करण देखें!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + योगदानकर्ताओं के लिए आह्वान: Web Almanac 2025 बनाने में मदद करें और इस वर्ष के संस्करण को आकार देने वाली टीम का हिस्सा बनें! +

{%- endif -%} {% endblock %} From 24ad20dd0b4a7c4bdf41b188658bb8a6a4f72144 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:50:42 +0300 Subject: [PATCH 05/18] feat(i18n): add contributor call-to-action for current edition in (it) --- src/templates/it/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/it/base.html b/src/templates/it/base.html index bbdda23d3d6..88b1e1acf85 100644 --- a/src/templates/it/base.html +++ b/src/templates/it/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Stai visualizzando un’edizione precedente del Web Almanac. Dai un’occhiata all’edizione del {{ DEFAULT_YEAR }}!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Chiamata per i contributori: Aiuta a creare il Web Almanac 2025 ed entra a far parte del team che darà forma all’edizione di quest’anno! +

{%- endif -%} {% endblock %} From e738fac51f39b25723d74de31388835dd722e8e7 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:51:47 +0300 Subject: [PATCH 06/18] feat(i18n): add contributor call-to-action for current edition in (ja) --- src/templates/ja/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/ja/base.html b/src/templates/ja/base.html index 9b80cf40c10..025cfec97d7 100644 --- a/src/templates/ja/base.html +++ b/src/templates/ja/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

ご覧になっているのは、Web Almanac の以前の版です。 {{ DEFAULT_YEAR }} 年版をご覧ください。

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + コントリビューター募集中: Web Almanac 2025 の作成に参加して、今年のエディションを形作るチームの一員になりましょう！ +

{%- endif -%} {% endblock %} From 5862e7ca1bd49cedabb23d37b7cc59752495b381 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:55:19 +0300 Subject: [PATCH 07/18] feat(i18n): add contributor call-to-action for current edition in (nl) --- src/templates/nl/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/nl/base.html b/src/templates/nl/base.html index 3568242976e..3c52a0b8992 100644 --- a/src/templates/nl/base.html +++ b/src/templates/nl/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

U bekijkt een eerdere editie van de Web Almanac. Bekijk de editie van {{ DEFAULT_YEAR }}!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Oproep aan bijdragers: Help mee met het maken van de Web Almanac 2025 en word onderdeel van het team dat deze editie vormgeeft! +

{%- endif -%} {% endblock %} From e82a7ef8b488572e1dc342d2169f691d618b76fd Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:56:16 +0300 Subject: [PATCH 08/18] feat(i18n): add contributor call-to-action for current edition in (pt) --- src/templates/pt/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/pt/base.html b/src/templates/pt/base.html index 377306e775d..c024b3f840f 100644 --- a/src/templates/pt/base.html +++ b/src/templates/pt/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Você está visualizando uma edição anterior do Web Almanac. Confira a edição de {{ DEFAULT_YEAR }}!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Chamada para Contribuidores: Ajude a criar o Web Almanac 2025 e faça parte da equipe que está moldando a edição deste ano! +

{%- endif -%} {% endblock %} From 5b74e5581734b331265a8172b761434b194b9cfa Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 22:57:26 +0300 Subject: [PATCH 09/18] feat(i18n): add contributor call-to-action for current edition in (ru) --- src/templates/ru/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/ru/base.html b/src/templates/ru/base.html index 7c3b356def5..535f0c2e6ff 100644 --- a/src/templates/ru/base.html +++ b/src/templates/ru/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Вы просматриваете предыдущий выпуск Веб-альманаха. Ознакомьтесь с выпуском {{ DEFAULT_YEAR }} года!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Призыв к участию: Помогите создать Web Almanac 2025 и станьте частью команды, формирующей выпуск этого года! +

{%- endif -%} {% endblock %} From 9e3a4daba6ce60e320525d5e42e2d7a43ead7ae6 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 23:02:58 +0300 Subject: [PATCH 10/18] feat(i18n): add contributor call-to-action for current edition in (tr) --- src/templates/tr/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/tr/base.html b/src/templates/tr/base.html index b7683353de2..d6d698cb842 100644 --- a/src/templates/tr/base.html +++ b/src/templates/tr/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Web Almanac'ın önceki bir baskısını görüntülüyorsunuz. {{ DEFAULT_YEAR }} baskısına göz atın!.

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Katkı sağlamak ister misiniz? Web Almanac 2025’in oluşturulmasına yardım edin ve bu yılki baskıyı şekillendiren ekibin bir parçası olun! +

{%- endif -%} {% endblock %} From d916a749198e66587dcb6fbf0cb3bf0166e32e84 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 23:03:57 +0300 Subject: [PATCH 11/18] feat(i18n): add contributor call-to-action for current edition in (uk) --- src/templates/uk/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/uk/base.html b/src/templates/uk/base.html index 2dc8eba0d53..40958e79356 100644 --- a/src/templates/uk/base.html +++ b/src/templates/uk/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Ви переглядаєте попереднє видання веб-альманаху. Перегляньте випуск {{ DEFAULT_YEAR }} року!

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + Заклик до учасників: Допоможіть створити Web Almanac 2025 і станьте частиною команди, яка формує цьогорічне видання! +

{%- endif -%} {% endblock %} From 1e3ab72ce5c2bcfc1177cc86ff629f47c0b6d490 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 23:06:04 +0300 Subject: [PATCH 12/18] feat(i18n): add contributor call-to-action for current edition in (zh-CN) --- src/templates/zh-CN/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/zh-CN/base.html b/src/templates/zh-CN/base.html index 02fc9409a1b..e79d8e97f43 100644 --- a/src/templates/zh-CN/base.html +++ b/src/templates/zh-CN/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

您正在查看 Web 年鉴的上一版。 查看 {{ DEFAULT_YEAR }} 年版！.

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + 贡献者招募: 帮助打造 Web Almanac 2025，加入塑造本年度版本的团队吧！ +

{%- endif -%} {% endblock %} From 493bcd1e46602c642f6b2abd6e8d38e4c5bcfc5e Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 23:07:14 +0300 Subject: [PATCH 13/18] feat(i18n): add contributor call-to-action for current edition in (zh-TW) --- src/templates/zh-TW/base.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/templates/zh-TW/base.html b/src/templates/zh-TW/base.html index 44e76648031..b50bbdb4a3b 100644 --- a/src/templates/zh-TW/base.html +++ b/src/templates/zh-TW/base.html @@ -20,10 +20,15 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

您正在查看舊版網路年鑑。 查看 {{ DEFAULT_YEAR }} 年版！.

+{%- elif year == DEFAULT_YEAR -%} +

+ 📣 + 徵求貢獻者: 協助製作 Web Almanac 2025，成為打造今年版本團隊的一份子！ +

{%- endif -%} {% endblock %} From 2a28b39e3c87d13f8fa9276c3d3bffd81ebed173 Mon Sep 17 00:00:00 2001 From: krlslman Date: Mon, 5 May 2025 23:31:49 +0300 Subject: [PATCH 14/18] new contributor added --- src/config/contributors.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/config/contributors.json b/src/config/contributors.json index a20f6594c19..f284caff951 100644 --- a/src/config/contributors.json +++ b/src/config/contributors.json @@ -5032,5 +5032,16 @@ ] }, "twitter": "_cybai" + }, + "krlslman": { + "avatar_url": "68502548", + "github": "krlslman", + "name": "Selman Koral", + "teams": { + "2024": [ + "developers", + "translators" + ] + } } } From 25a1bca0f694fa0a3a5be53af9a388500d871769 Mon Sep 17 00:00:00 2001 From: krlslman Date: Tue, 6 May 2025 21:28:42 +0300 Subject: [PATCH 15/18] first name order --- src/config/contributors.json | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/config/contributors.json b/src/config/contributors.json index f284caff951..7017025ef48 100644 --- a/src/config/contributors.json +++ b/src/config/contributors.json @@ -4208,6 +4208,21 @@ "twitter": "Scott_Helme", "website": "https://scotthelme.co.uk" }, + "krlslman": { + "avatar_url": "68502548", + "github": "krlslman", + "name": "Selman Koral", + "teams": { + "2024": [ + "developers", + "translators" + ], + "2025": [ + "developers", + "translators" + ] + } + }, "sergeychernyshev": { "avatar_url": "38076", "github": "sergeychernyshev", @@ -5032,16 +5047,5 @@ ] }, "twitter": "_cybai" - }, - "krlslman": { - "avatar_url": "68502548", - "github": "krlslman", - "name": "Selman Koral", - "teams": { - "2024": [ - "developers", - "translators" - ] - } } } From c0f6d95f63c2f625feea2314b2089dc33e897de6 Mon Sep 17 00:00:00 2001 From: krlslman Date: Tue, 6 May 2025 22:50:12 +0300 Subject: [PATCH 16/18] fix for year in call_for_contributors --- src/server/__init__.py | 2 ++ src/templates/base/base.html | 4 ++++ src/templates/en/base.html | 10 +++++----- src/templates/es/base.html | 10 +++++----- src/templates/fr/base.html | 10 +++++----- src/templates/hi/base.html | 10 +++++----- src/templates/it/base.html | 10 +++++----- src/templates/ja/base.html | 10 +++++----- src/templates/nl/base.html | 10 +++++----- src/templates/pt/base.html | 10 +++++----- src/templates/ru/base.html | 10 +++++----- src/templates/tr/base.html | 10 +++++----- src/templates/uk/base.html | 10 +++++----- src/templates/zh-CN/base.html | 10 +++++----- src/templates/zh-TW/base.html | 10 +++++----- 15 files changed, 71 insertions(+), 65 deletions(-) diff --git a/src/server/__init__.py b/src/server/__init__.py index e4884056518..f758ea36dd4 100644 --- a/src/server/__init__.py +++ b/src/server/__init__.py @@ -12,6 +12,7 @@ accentless_sort, get_versioned_filename, ) +from datetime import datetime from .config import TEMPLATES_DIR, STATIC_DIR from . import csp, feature_policy import logging @@ -72,6 +73,7 @@ def add_header(response): app.jinja_env.globals["year_live"] = year_live app.jinja_env.globals["get_versioned_filename"] = get_versioned_filename app.jinja_env.filters["accentless_sort"] = accentless_sort +app.jinja_env.globals['now'] = datetime.now talisman = Talisman( app, diff --git a/src/templates/base/base.html b/src/templates/base/base.html index 62829737523..49e7bdbfa61 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -634,6 +634,10 @@ {% endblock %} {% endblock %} +{% block call_for_contributors %} +https://github.com/HTTPArchive/almanac.httparchive.org/discussions/4062 +{% endblock %} + {% macro figure_dropdown(metadata, chapter_config, id, sheets_gid="", sql_file="", image="", caption="") %} {% if sheets_gid != "" or sql_file != "" or image != "" %}
diff --git a/src/templates/en/base.html b/src/templates/en/base.html index 3be0c09aef0..1d85254f53d 100644 --- a/src/templates/en/base.html +++ b/src/templates/en/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

You’re viewing a previous edition of the Web Almanac. Check out the {{ DEFAULT_YEAR }} edition!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Call for Contributors: Help create the Web Almanac 2025 and be part of the team shaping this year’s edition! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Call for Contributors: Help create the {{ now().year }} Web Almanac— be part of the team shaping this year’s edition!

{%- endif -%} {% endblock %} diff --git a/src/templates/es/base.html b/src/templates/es/base.html index f21aa40d0a8..a78419f7d4e 100644 --- a/src/templates/es/base.html +++ b/src/templates/es/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Estás viendo una edición anterior del Web Almanac. ¡Consulta a edición de {{ DEFAULT_YEAR }}!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Convocatoria para colaboradores: ¡Ayuda a crear el Web Almanac 2025 y forma parte del equipo que da forma a la edición de este año! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Convocatoria para colaboradores: Ayuda a crear el Web Almanac {{ now().year }}— ¡sé parte del equipo que da forma a la edición de este año!

{%- endif -%} {% endblock %} diff --git a/src/templates/fr/base.html b/src/templates/fr/base.html index a98dd37febe..e79b6176926 100644 --- a/src/templates/fr/base.html +++ b/src/templates/fr/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Vous consultez une édition précédente du Web Almanac. Découvrez l’édition {{ DEFAULT_YEAR }}!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Appel à contributions: Aidez à créer le Web Almanac 2025 et faites partie de l’équipe qui façonne l’édition de cette année ! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Appel à contributions: Aidez à créer le Web Almanac {{ now().year }} — faites partie de l'équipe qui façonne l'édition de cette année !

{%- endif -%} {% endblock %} diff --git a/src/templates/hi/base.html b/src/templates/hi/base.html index 9254b99313c..9969a040cf5 100644 --- a/src/templates/hi/base.html +++ b/src/templates/hi/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

आप वेब पंचांग का पिछला संस्करण देख रहे हैं। {{ DEFAULT_YEAR }} संस्करण देखें!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - योगदानकर्ताओं के लिए आह्वान: Web Almanac 2025 बनाने में मदद करें और इस वर्ष के संस्करण को आकार देने वाली टीम का हिस्सा बनें! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + योगदानकर्ताओं के लिए आह्वान: {{ now().year }} Web Almanac बनाने में मदद करें— इस वर्ष की संस्करण को आकार देने वाली टीम का हिस्सा बनें!

{%- endif -%} {% endblock %} diff --git a/src/templates/it/base.html b/src/templates/it/base.html index 88b1e1acf85..27143aaed44 100644 --- a/src/templates/it/base.html +++ b/src/templates/it/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Stai visualizzando un’edizione precedente del Web Almanac. Dai un’occhiata all’edizione del {{ DEFAULT_YEAR }}!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Chiamata per i contributori: Aiuta a creare il Web Almanac 2025 ed entra a far parte del team che darà forma all’edizione di quest’anno! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Chiamata per i contributori: Aiuta a creare il Web Almanac {{ now().year }}— entra a far parte del team che darà forma all’edizione di quest’anno!

{%- endif -%} {% endblock %} diff --git a/src/templates/ja/base.html b/src/templates/ja/base.html index 025cfec97d7..eb51ebf7fda 100644 --- a/src/templates/ja/base.html +++ b/src/templates/ja/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

ご覧になっているのは、Web Almanac の以前の版です。 {{ DEFAULT_YEAR }} 年版をご覧ください。

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - コントリビューター募集中: Web Almanac 2025 の作成に参加して、今年のエディションを形作るチームの一員になりましょう！ +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + コントリビューター募集中: {{ now().year }} Web Almanac の作成にご協力ください— 今年のエディションを形作るチームの一員になりましょう！

{%- endif -%} {% endblock %} diff --git a/src/templates/nl/base.html b/src/templates/nl/base.html index 3c52a0b8992..b2c4f20d41d 100644 --- a/src/templates/nl/base.html +++ b/src/templates/nl/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

U bekijkt een eerdere editie van de Web Almanac. Bekijk de editie van {{ DEFAULT_YEAR }}!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Oproep aan bijdragers: Help mee met het maken van de Web Almanac 2025 en word onderdeel van het team dat deze editie vormgeeft! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Oproep aan bijdragers: Help mee de Web Almanac {{ now().year }} te maken— en word onderdeel van het team dat deze editie vormgeeft!

{%- endif -%} {% endblock %} diff --git a/src/templates/pt/base.html b/src/templates/pt/base.html index c024b3f840f..dfa222f4412 100644 --- a/src/templates/pt/base.html +++ b/src/templates/pt/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Você está visualizando uma edição anterior do Web Almanac. Confira a edição de {{ DEFAULT_YEAR }}!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Chamada para Contribuidores: Ajude a criar o Web Almanac 2025 e faça parte da equipe que está moldando a edição deste ano! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Chamada para Contribuidores: Ajude a criar o Web Almanac de {{ now().year }} — faça parte da equipe que está moldando a edição deste ano!

{%- endif -%} {% endblock %} diff --git a/src/templates/ru/base.html b/src/templates/ru/base.html index 535f0c2e6ff..ec5469f86c7 100644 --- a/src/templates/ru/base.html +++ b/src/templates/ru/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Вы просматриваете предыдущий выпуск Веб-альманаха. Ознакомьтесь с выпуском {{ DEFAULT_YEAR }} года!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Призыв к участию: Помогите создать Web Almanac 2025 и станьте частью команды, формирующей выпуск этого года! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Призыв к участию: Помогите создать Web Almanac {{ now().year }} — станьте частью команды, формирующей выпуск этого года!

{%- endif -%} {% endblock %} diff --git a/src/templates/tr/base.html b/src/templates/tr/base.html index d6d698cb842..1a86c0dfcf8 100644 --- a/src/templates/tr/base.html +++ b/src/templates/tr/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Web Almanac'ın önceki bir baskısını görüntülüyorsunuz. {{ DEFAULT_YEAR }} baskısına göz atın!.

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Katkı sağlamak ister misiniz? Web Almanac 2025’in oluşturulmasına yardım edin ve bu yılki baskıyı şekillendiren ekibin bir parçası olun! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Katkı sağlamak ister misiniz? {{ now().year }} Web Almanac'ı oluşturmaya yardım edin— bu yılki baskıyı şekillendiren ekibin bir parçası olun!

{%- endif -%} {% endblock %} diff --git a/src/templates/uk/base.html b/src/templates/uk/base.html index 40958e79356..84620fe9901 100644 --- a/src/templates/uk/base.html +++ b/src/templates/uk/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

Ви переглядаєте попереднє видання веб-альманаху. Перегляньте випуск {{ DEFAULT_YEAR }} року!

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - Заклик до учасників: Допоможіть створити Web Almanac 2025 і станьте частиною команди, яка формує цьогорічне видання! +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + Заклик до учасників: Допоможіть створити Web Almanac {{ now().year }} — станьте частиною команди, яка формує цьогорічний випуск!

{%- endif -%} {% endblock %} diff --git a/src/templates/zh-CN/base.html b/src/templates/zh-CN/base.html index e79d8e97f43..8f7a2d50e2c 100644 --- a/src/templates/zh-CN/base.html +++ b/src/templates/zh-CN/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

您正在查看 Web 年鉴的上一版。 查看 {{ DEFAULT_YEAR }} 年版！.

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - 贡献者招募: 帮助打造 Web Almanac 2025，加入塑造本年度版本的团队吧！ +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + 贡献者招募: 帮助创建 {{ now().year }} 年的 Web Almanac —— 成为塑造今年版本的团队一员！

{%- endif -%} {% endblock %} diff --git a/src/templates/zh-TW/base.html b/src/templates/zh-TW/base.html index b50bbdb4a3b..22c7b01a919 100644 --- a/src/templates/zh-TW/base.html +++ b/src/templates/zh-TW/base.html @@ -20,14 +20,14 @@ {% block announcement_text -%} {%- if year < DEFAULT_YEAR -%} -

+

您正在查看舊版網路年鑑。 查看 {{ DEFAULT_YEAR }} 年版！.

-{%- elif year == DEFAULT_YEAR -%} -

- 📣 - 徵求貢獻者: 協助製作 Web Almanac 2025，成為打造今年版本團隊的一份子！ +{%- elif self.call_for_contributors() | trim | length > 0 -%} +

+ 📣 + 徵求貢獻者: 協助打造 {{ now().year }} 年的 Web Almanac —— 成為今年版本製作團隊的一員！

{%- endif -%} {% endblock %} From f11cb0c5ab7b22dc5f9c22bbbaa6efbf163fca63 Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Tue, 6 May 2025 22:31:18 +0100 Subject: [PATCH 17/18] Tweaks --- src/static/css/almanac.css | 10 ++++++++++ src/static/css/page.css | 10 ---------- src/templates/base/base.html | 6 ++---- src/templates/en/base.html | 6 +++--- src/templates/es/base.html | 6 +++--- src/templates/fr/base.html | 6 +++--- src/templates/hi/base.html | 6 +++--- src/templates/it/base.html | 6 +++--- src/templates/ja/base.html | 6 +++--- src/templates/nl/base.html | 6 +++--- src/templates/pt/base.html | 6 +++--- src/templates/ru/base.html | 6 +++--- src/templates/tr/base.html | 6 +++--- src/templates/uk/base.html | 6 +++--- src/templates/zh-CN/base.html | 6 +++--- src/templates/zh-TW/base.html | 6 +++--- 16 files changed, 51 insertions(+), 53 deletions(-) diff --git a/src/static/css/almanac.css b/src/static/css/almanac.css index a55feabe298..5a61f648770 100644 --- a/src/static/css/almanac.css +++ b/src/static/css/almanac.css @@ -347,6 +347,16 @@ aside.banner p { margin: 0; } +aside, +.note { + font-style: italic; +} + +aside em, +.note em { + font-style: normal; +} + /* Main title, subtitle and modifiers */ .title, .subtitle { diff --git a/src/static/css/page.css b/src/static/css/page.css index adb5a55944e..9ae9f2e362b 100644 --- a/src/static/css/page.css +++ b/src/static/css/page.css @@ -454,16 +454,6 @@ right: -1.5rem; } -aside, -.note { - font-style: italic; -} - -aside em, -.note em { - font-style: normal; -} - table, figure { max-width: 100%; diff --git a/src/templates/base/base.html b/src/templates/base/base.html index 49e7bdbfa61..2a75038212a 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -106,6 +106,8 @@ {% endblock %} +{% block call_for_contributors_link %}https://github.com/HTTPArchive/almanac.httparchive.org/discussions/4062{% endblock %} + {% block contributors %}{{ config.contributors.keys() | length }}{% endblock %} {% block non_chapter_nav_links %} @@ -634,10 +636,6 @@ {% endblock %} {% endblock %} -{% block call_for_contributors %} -https://github.com/HTTPArchive/almanac.httparchive.org/discussions/4062 -{% endblock %} - {% macro figure_dropdown(metadata, chapter_config, id, sheets_gid="", sql_file="", image="", caption="") %} {% if sheets_gid != "" or sql_file != "" or image != "" %}
diff --git a/src/templates/en/base.html b/src/templates/en/base.html index 1d85254f53d..3e3050ae1ad 100644 --- a/src/templates/en/base.html +++ b/src/templates/en/base.html @@ -24,10 +24,10 @@ You’re viewing a previous edition of the Web Almanac. Check out the {{ DEFAULT_YEAR }} edition!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Call for Contributors: Help create the {{ now().year }} Web Almanac— be part of the team shaping this year’s edition! + 📣 Call for Contributors: +Help create the {{ now().year }} Web Almanac— be part of the team shaping this year’s edition!

{%- endif -%} {% endblock %} diff --git a/src/templates/es/base.html b/src/templates/es/base.html index a78419f7d4e..7acec27403b 100644 --- a/src/templates/es/base.html +++ b/src/templates/es/base.html @@ -24,10 +24,10 @@ Estás viendo una edición anterior del Web Almanac. ¡Consulta a edición de {{ DEFAULT_YEAR }}!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Convocatoria para colaboradores: Ayuda a crear el Web Almanac {{ now().year }}— ¡sé parte del equipo que da forma a la edición de este año! + 📣 Convocatoria para colaboradores: +Ayuda a crear el Web Almanac {{ now().year }}— ¡sé parte del equipo que da forma a la edición de este año!

{%- endif -%} {% endblock %} diff --git a/src/templates/fr/base.html b/src/templates/fr/base.html index e79b6176926..9a38c50a32b 100644 --- a/src/templates/fr/base.html +++ b/src/templates/fr/base.html @@ -24,10 +24,10 @@ Vous consultez une édition précédente du Web Almanac. Découvrez l’édition {{ DEFAULT_YEAR }}!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Appel à contributions: Aidez à créer le Web Almanac {{ now().year }} — faites partie de l'équipe qui façonne l'édition de cette année ! + 📣 Appel à contributions: +Aidez à créer le Web Almanac {{ now().year }} — faites partie de l'équipe qui façonne l'édition de cette année !

{%- endif -%} {% endblock %} diff --git a/src/templates/hi/base.html b/src/templates/hi/base.html index 9969a040cf5..dd941cafda2 100644 --- a/src/templates/hi/base.html +++ b/src/templates/hi/base.html @@ -24,10 +24,10 @@ आप वेब पंचांग का पिछला संस्करण देख रहे हैं। {{ DEFAULT_YEAR }} संस्करण देखें!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - योगदानकर्ताओं के लिए आह्वान: {{ now().year }} Web Almanac बनाने में मदद करें— इस वर्ष की संस्करण को आकार देने वाली टीम का हिस्सा बनें! + 📣 योगदानकर्ताओं के लिए आह्वान: +{{ now().year }} Web Almanac बनाने में मदद करें— इस वर्ष की संस्करण को आकार देने वाली टीम का हिस्सा बनें!

{%- endif -%} {% endblock %} diff --git a/src/templates/it/base.html b/src/templates/it/base.html index 27143aaed44..a18354587b9 100644 --- a/src/templates/it/base.html +++ b/src/templates/it/base.html @@ -24,10 +24,10 @@ Stai visualizzando un’edizione precedente del Web Almanac. Dai un’occhiata all’edizione del {{ DEFAULT_YEAR }}!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Chiamata per i contributori: Aiuta a creare il Web Almanac {{ now().year }}— entra a far parte del team che darà forma all’edizione di quest’anno! + 📣 Chiamata per i contributori: + Aiuta a creare il Web Almanac {{ now().year }}— entra a far parte del team che darà forma all’edizione di quest’anno!

{%- endif -%} {% endblock %} diff --git a/src/templates/ja/base.html b/src/templates/ja/base.html index eb51ebf7fda..25c39518d01 100644 --- a/src/templates/ja/base.html +++ b/src/templates/ja/base.html @@ -24,10 +24,10 @@ ご覧になっているのは、Web Almanac の以前の版です。 {{ DEFAULT_YEAR }} 年版をご覧ください。

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - コントリビューター募集中: {{ now().year }} Web Almanac の作成にご協力ください— 今年のエディションを形作るチームの一員になりましょう！ + 📣 コントリビューター募集中: +{{ now().year }} Web Almanac の作成にご協力ください— 今年のエディションを形作るチームの一員になりましょう！

{%- endif -%} {% endblock %} diff --git a/src/templates/nl/base.html b/src/templates/nl/base.html index b2c4f20d41d..7d73ff93056 100644 --- a/src/templates/nl/base.html +++ b/src/templates/nl/base.html @@ -24,10 +24,10 @@ U bekijkt een eerdere editie van de Web Almanac. Bekijk de editie van {{ DEFAULT_YEAR }}!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Oproep aan bijdragers: Help mee de Web Almanac {{ now().year }} te maken— en word onderdeel van het team dat deze editie vormgeeft! + 📣 Oproep aan bijdragers: +Help mee de Web Almanac {{ now().year }} te maken— en word onderdeel van het team dat deze editie vormgeeft!

{%- endif -%} {% endblock %} diff --git a/src/templates/pt/base.html b/src/templates/pt/base.html index dfa222f4412..3879441f939 100644 --- a/src/templates/pt/base.html +++ b/src/templates/pt/base.html @@ -24,10 +24,10 @@ Você está visualizando uma edição anterior do Web Almanac. Confira a edição de {{ DEFAULT_YEAR }}!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Chamada para Contribuidores: Ajude a criar o Web Almanac de {{ now().year }} — faça parte da equipe que está moldando a edição deste ano! + 📣 Chamada para Contribuidores: +Ajude a criar o Web Almanac de {{ now().year }} — faça parte da equipe que está moldando a edição deste ano!

{%- endif -%} {% endblock %} diff --git a/src/templates/ru/base.html b/src/templates/ru/base.html index ec5469f86c7..3fc0513dfd7 100644 --- a/src/templates/ru/base.html +++ b/src/templates/ru/base.html @@ -24,10 +24,10 @@ Вы просматриваете предыдущий выпуск Веб-альманаха. Ознакомьтесь с выпуском {{ DEFAULT_YEAR }} года!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Призыв к участию: Помогите создать Web Almanac {{ now().year }} — станьте частью команды, формирующей выпуск этого года! + 📣 Призыв к участию: +Помогите создать Web Almanac {{ now().year }} — станьте частью команды, формирующей выпуск этого года!

{%- endif -%} {% endblock %} diff --git a/src/templates/tr/base.html b/src/templates/tr/base.html index 1a86c0dfcf8..8fd7a865cdf 100644 --- a/src/templates/tr/base.html +++ b/src/templates/tr/base.html @@ -24,10 +24,10 @@ Web Almanac'ın önceki bir baskısını görüntülüyorsunuz. {{ DEFAULT_YEAR }} baskısına göz atın!.

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Katkı sağlamak ister misiniz? {{ now().year }} Web Almanac'ı oluşturmaya yardım edin— bu yılki baskıyı şekillendiren ekibin bir parçası olun! + 📣 Katkı sağlamak ister misiniz? + {{ now().year }} Web Almanac'ı oluşturmaya yardım edin— bu yılki baskıyı şekillendiren ekibin bir parçası olun!

{%- endif -%} {% endblock %} diff --git a/src/templates/uk/base.html b/src/templates/uk/base.html index 84620fe9901..3173748a863 100644 --- a/src/templates/uk/base.html +++ b/src/templates/uk/base.html @@ -24,10 +24,10 @@ Ви переглядаєте попереднє видання веб-альманаху. Перегляньте випуск {{ DEFAULT_YEAR }} року!

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - Заклик до учасників: Допоможіть створити Web Almanac {{ now().year }} — станьте частиною команди, яка формує цьогорічний випуск! + 📣 Заклик до учасників: +Допоможіть створити Web Almanac {{ now().year }} — станьте частиною команди, яка формує цьогорічний випуск!

{%- endif -%} {% endblock %} diff --git a/src/templates/zh-CN/base.html b/src/templates/zh-CN/base.html index 8f7a2d50e2c..41b8e8c6168 100644 --- a/src/templates/zh-CN/base.html +++ b/src/templates/zh-CN/base.html @@ -24,10 +24,10 @@ 您正在查看 Web 年鉴的上一版。 查看 {{ DEFAULT_YEAR }} 年版！.

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - 贡献者招募: 帮助创建 {{ now().year }} 年的 Web Almanac —— 成为塑造今年版本的团队一员！ + 📣 贡献者招募: +帮助创建 {{ now().year }} 年的 Web Almanac —— 成为塑造今年版本的团队一员！

{%- endif -%} {% endblock %} diff --git a/src/templates/zh-TW/base.html b/src/templates/zh-TW/base.html index 22c7b01a919..ee703048c64 100644 --- a/src/templates/zh-TW/base.html +++ b/src/templates/zh-TW/base.html @@ -24,10 +24,10 @@ 您正在查看舊版網路年鑑。 查看 {{ DEFAULT_YEAR }} 年版！.

-{%- elif self.call_for_contributors() | trim | length > 0 -%} +{%- elif self.call_for_contributors_link() | trim | length > 0 -%}

- 📣 - 徵求貢獻者: 協助打造 {{ now().year }} 年的 Web Almanac —— 成為今年版本製作團隊的一員！ + 📣 徵求貢獻者: +協助打造 {{ now().year }} 年的 Web Almanac —— 成為今年版本製作團隊的一員！

{%- endif -%} {% endblock %} From 6668588cf2639d9702f228f00670c5f5f1c39ced Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Tue, 6 May 2025 22:42:10 +0100 Subject: [PATCH 18/18] Linting --- src/templates/it/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/it/base.html b/src/templates/it/base.html index a18354587b9..0ed301d1d14 100644 --- a/src/templates/it/base.html +++ b/src/templates/it/base.html @@ -27,7 +27,7 @@ {%- elif self.call_for_contributors_link() | trim | length > 0 -%}

📣 Chiamata per i contributori: - Aiuta a creare il Web Almanac {{ now().year }}— entra a far parte del team che darà forma all’edizione di quest’anno! + Aiuta a creare il Web Almanac {{ now().year }}— entra a far parte del team che darà forma all’edizione di quest’anno!

{%- endif -%} {% endblock %}