Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
362d313
feat(i18n): add contributor call-to-action for current edition in (en)
krlslman May 5, 2025
89cc2e9
feat(i18n): add contributor call-to-action for current edition in (es)
krlslman May 5, 2025
6edeea2
feat(i18n): add contributor call-to-action for current edition in (fr)
krlslman May 5, 2025
9e9c1a8
feat(i18n): add contributor call-to-action for current edition in (hi)
krlslman May 5, 2025
24ad20d
feat(i18n): add contributor call-to-action for current edition in (it)
krlslman May 5, 2025
e738fac
feat(i18n): add contributor call-to-action for current edition in (ja)
krlslman May 5, 2025
5862e7c
feat(i18n): add contributor call-to-action for current edition in (nl)
krlslman May 5, 2025
e82a7ef
feat(i18n): add contributor call-to-action for current edition in (pt)
krlslman May 5, 2025
5b74e55
feat(i18n): add contributor call-to-action for current edition in (ru)
krlslman May 5, 2025
9e3a4da
feat(i18n): add contributor call-to-action for current edition in (tr)
krlslman May 5, 2025
d916a74
feat(i18n): add contributor call-to-action for current edition in (uk)
krlslman May 5, 2025
1e3ab72
feat(i18n): add contributor call-to-action for current edition in (zh…
krlslman May 5, 2025
493bcd1
feat(i18n): add contributor call-to-action for current edition in (zh…
krlslman May 5, 2025
2a28b39
new contributor added
krlslman May 5, 2025
25a1bca
first name order
krlslman May 6, 2025
c0f6d95
fix for year in call_for_contributors
krlslman May 6, 2025
f11cb0c
Tweaks
tunetheweb May 6, 2025
6668588
Linting
tunetheweb May 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/config/contributors.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 10 additions & 0 deletions src/static/css/almanac.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 0 additions & 10 deletions src/static/css/page.css
Original file line number Diff line number Diff line change
Expand Up @@ -454,16 +454,6 @@
right: -1.5rem;
}

aside,
.note {
font-style: italic;
}

aside em,
.note em {
font-style: normal;
}

table,
figure {
max-width: 100%;
Expand Down
2 changes: 2 additions & 0 deletions src/templates/base/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
7 changes: 6 additions & 1 deletion src/templates/en/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
You’re viewing a previous edition of the Web Almanac.
Check out the <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} edition!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Call for Contributors</b></a>:
Help create the {{ now().year }} Web Almanac— be part of the team shaping this year’s edition!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/es/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Estás viendo una edición anterior del Web Almanac.
¡Consulta <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">a edición de {{ DEFAULT_YEAR }}!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Convocatoria para colaboradores</b></a>:
Ayuda a crear el Web Almanac {{ now().year }}— ¡sé parte del equipo que da forma a la edición de este año!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/fr/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Vous consultez une édition précédente du Web Almanac.
Découvrez <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">l’édition {{ DEFAULT_YEAR }}!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Appel à contributions</b></a>:
Aidez à créer le Web Almanac {{ now().year }} — faites partie de l'équipe qui façonne l'édition de cette année !
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/hi/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
आप वेब पंचांग का पिछला संस्करण देख रहे हैं।
<a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} संस्करण</a> देखें!
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>योगदानकर्ताओं के लिए आह्वान</b></a>:
{{ now().year }} Web Almanac बनाने में मदद करें— इस वर्ष की संस्करण को आकार देने वाली टीम का हिस्सा बनें!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/it/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Stai visualizzando un’edizione precedente del Web Almanac.
Dai un’occhiata all’<a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">edizione del {{ DEFAULT_YEAR }}!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Chiamata per i contributori</b></a>:
Aiuta a creare il Web Almanac {{ now().year }}— entra a far parte del team che darà forma all’edizione di quest’anno!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/ja/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
ご覧になっているのは、Web Almanac の以前の版です。
<a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} 年版</a>をご覧ください。
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>コントリビューター募集中</b></a>:
{{ now().year }} Web Almanac の作成にご協力ください— 今年のエディションを形作るチームの一員になりましょう!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/nl/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
U bekijkt een eerdere editie van de Web Almanac.
Bekijk de <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">editie van {{ DEFAULT_YEAR }}!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Oproep aan bijdragers</b></a>:
Help mee de Web Almanac {{ now().year }} te maken— en word onderdeel van het team dat deze editie vormgeeft!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/pt/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Você está visualizando uma edição anterior do Web Almanac.
Confira a <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">edição de {{ DEFAULT_YEAR }}!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Chamada para Contribuidores</b></a>:
Ajude a criar o Web Almanac de {{ now().year }} — faça parte da equipe que está moldando a edição deste ano!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/ru/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Вы просматриваете предыдущий выпуск Веб-альманаха.
Ознакомьтесь с выпуском <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} года!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Призыв к участию</b></a>:
Помогите создать Web Almanac {{ now().year }} — станьте частью команды, формирующей выпуск этого года!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/tr/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Web Almanac'ın önceki bir baskısını görüntülüyorsunuz.
<a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} baskısına</a> göz atın!.
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Katkı sağlamak ister misiniz?</b></a>
{{ now().year }} Web Almanac'ı oluşturmaya yardım edin— bu yılki baskıyı şekillendiren ekibin bir parçası olun!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/uk/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
Ви переглядаєте попереднє видання веб-альманаху.
Перегляньте випуск <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} року!</a>
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>Заклик до учасників</b></a>:
Допоможіть створити Web Almanac {{ now().year }} — станьте частиною команди, яка формує цьогорічний випуск!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/zh-CN/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
您正在查看 Web 年鉴的上一版。
查看 <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} 年版!</a>.
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>贡献者招募</b></a>:
帮助创建 {{ now().year }} 年的 Web Almanac —— 成为塑造今年版本的团队一员!
</p>
{%- endif -%}
{% endblock %}

Expand Down
7 changes: 6 additions & 1 deletion src/templates/zh-TW/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

{% block announcement_text -%}
{%- if year < DEFAULT_YEAR -%}
<p lang="en">
<p>
您正在查看舊版網路年鑑。
查看 <a href="/{{ lang }}/{{ DEFAULT_YEAR }}/{% if chapter_lang_exists(lang, DEFAULT_YEAR, slug) or page_lang_exists(lang, DEFAULT_YEAR, slug) %}{{ slug }}{% endif %}">{{ DEFAULT_YEAR }} 年版!</a>.
</p>
{%- elif self.call_for_contributors_link() | trim | length > 0 -%}
<p>
📣 <a hreflang="en" href="{{ self.call_for_contributors_link() }}"><b>徵求貢獻者</b></a>:
協助打造 {{ now().year }} 年的 Web Almanac —— 成為今年版本製作團隊的一員!
</p>
{%- endif -%}
{% endblock %}

Expand Down
Loading