Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config updates for new chapters and other misc cleanups #1232

Merged
merged 5 commits into from
Aug 23, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
31 changes: 23 additions & 8 deletions src/config/2020.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@
{
"part": "II",
"chapter": "13",
"title": "Capabilities",
"slug": "capabilities"
},
{
"part": "II",
"chapter": "14",
"title": "PWA",
"slug": "pwa"
}
Expand All @@ -103,19 +109,19 @@
"chapters": [
{
"part": "III",
"chapter": "14",
"chapter": "15",
"title": "CMS",
"slug": "cms"
},
{
"part": "III",
"chapter": "15",
"chapter": "16",
"title": "Ecommerce",
"slug": "ecommerce"
},
{
"part": "III",
"chapter": "16",
"chapter": "17",
"title": "JAMstack",
"slug": "jamstack"
}
Expand All @@ -127,31 +133,31 @@
"chapters": [
{
"part": "IV",
"chapter": "17",
"chapter": "18",
"title": "Page Weight",
"slug": "page-weight"
},
{
"part": "IV",
"chapter": "18",
"chapter": "19",
"title": "Compression",
"slug": "compression"
},
{
"part": "IV",
"chapter": "19",
"chapter": "20",
"title": "Caching",
"slug": "caching"
},
{
"part": "IV",
"chapter": "20",
"chapter": "21",
"title": "Resource Hints",
"slug": "resource-hints"
},
{
"part": "IV",
"chapter": "21",
"chapter": "22",
"title": "HTTP/2",
"slug": "http2"
}
Expand All @@ -165,6 +171,9 @@
"authors": {
"name": "Authors"
},
"designers": {
"name": "Designers"
},
"developers": {
"name": "Developers"
},
Expand Down Expand Up @@ -888,6 +897,12 @@
"github": "ipullrank",
"twitter": "IPullRank"
},
"michelleoconnor": {
"name": "Michelle O'Connor",
"teams": [
"designers"
]
},
"MikeBishop": {
"name": "Mike Bishop",
"teams": [
Expand Down
6 changes: 4 additions & 2 deletions src/server/language.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ def lang_code(self):
return self._lang_code


# Currently we are only supporting languages and not regions
# Mostly we are region agnostic languages, but can add region where
# there are significant differences (e.g. Chinese)
class Language(object):
JA = _Language('日本語', 'ja', 'JP')
EN = _Language('English', 'en', 'US')
ES = _Language('Español', 'es', 'ES')
FR = _Language('Français', 'fr', 'FR')
JA = _Language('日本語', 'ja', 'JP')
PT = _Language('Portuguese', 'pt', 'PT')
ZH_CN = _Language('简体中文', 'zh-CN', 'CN')


Expand Down
7 changes: 5 additions & 2 deletions src/templates/en/2019/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@
"cdn": "CDN",
"page-weight": "Page Weight",
"resource-hints": "Resource Hints",
"http2": "HTTP/2"
"http2": "HTTP/2",
"privacy": "Privacy",
"capabilities": "Capabilities",
"jamstack": "JAMstack"
tunetheweb marked this conversation as resolved.
Show resolved Hide resolved
}
%}

Expand All @@ -165,7 +168,7 @@
"designers": "Designers",
"developers": "Developers",
"editors": "Editors",
"leads": "Leads",
"leads": "Project Leads",
"reviewers": "Reviewers",
"translators": "Translators",
}
Expand Down
5 changes: 4 additions & 1 deletion src/templates/es/2019/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@
"cdn": "CDN",
"page-weight": "Peso de las Páginas",
"resource-hints": "Sugerencias de Recursos",
"http2": "HTTP/2"
"http2": "HTTP/2",
"privacy": "Intimidad",
"capabilities": "Capacidades",
"jamstack": "JAMstack"
}
%}

Expand Down
5 changes: 4 additions & 1 deletion src/templates/fr/2019/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@
"cdn": "CDN",
"page-weight": "Poids des pages",
"resource-hints": "Indices de Ressources",
"http2": "HTTP/2"
"http2": "HTTP/2",
"privacy": "Intimité",
tunetheweb marked this conversation as resolved.
Show resolved Hide resolved
"capabilities": "Capacités",
"jamstack": "JAMstack"
}
%}

Expand Down
5 changes: 4 additions & 1 deletion src/templates/ja/2019/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@
"cdn": "CDN",
"page-weight": "Page Weight",
"resource-hints": "リソースのヒント",
"http2": "HTTP/2"
"http2": "HTTP/2",
"privacy": "プライバシー",
"capabilities": "能力",
"jamstack": "JAMstack"
}
%}

Expand Down
7 changes: 5 additions & 2 deletions src/templates/pt/2019/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
{% block close_the_index %}Fechar índice de conteúdos{% endblock %}

{% block and %}e{% endblock %}
{% block comma %}, {% endblock %}

{% block open %}Abrir{% endblock %}
{% block close %}Fechar{% endblock %}
Expand All @@ -74,7 +75,6 @@

{% block footer_title %}Navegação no rodapé{% endblock %}
{% block copyright %}© Web Almanac. Licenciado sob <a href="https://github.com/HTTPArchive/almanac.httparchive.org/blob/main/LICENSE">Apache 2.0</a>.{% endblock %}

{% block accessibility_statement %}Declaração de acessibilidade{% endblock %}

{% block featured_chapter %}Capítulo em Destaque{% endblock %}
Expand Down Expand Up @@ -154,7 +154,10 @@
"cdn": "CDN",
"page-weight": "Peso da página",
"resource-hints": "Dicas de Recursos",
"http2": "HTTP/2"
"http2": "HTTP/2",
"privacy": "Privacidade",
"capabilities": "Capacidades",
"jamstack": "JAMstack"
}
%}

Expand Down
5 changes: 4 additions & 1 deletion src/templates/zh-CN/2019/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@
"cdn": "CDN",
"page-weight": "页面重量",
"resource-hints": "资源提示",
"http2": "HTTP/2"
"http2": "HTTP/2",
"privacy": "隐私",
"capabilities": "能力",
"jamstack": "JAMstack"
}
%}

Expand Down