hak8or/blog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make dates respect current locale (deprecations!)

Browse Source 
And make comments use it in a smart way (it's not but it works)

Deprecate "extra.date_format" and "extra.comments.locale" and replace it
with "date_format" and "date_locale" in translation files
This commit is contained in:
daudix
2024-06-20 19:24:31 +03:00
parent 13fad928f7
commit 238f84de30
16 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/article.html
View File

@ -1,13 +1,15 @@
{% extends "base.html" %}
{% block content %}
{% set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) %}
{% set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) %}
<article>
<h1>{{ page.title }}</h1>
{%- if page.date %}
<small>
<time datetime="{{ page.date | date(format=' %+') }}" pubdate>
{{- page.date | date(format=config.extra.date_format) -}}
{{- page.date | date(format=date_format, locale=date_locale) -}}
</time>
{%- if page.authors %}
<span>•</span>

4
templates/article_list.html
View File

@ -1,6 +1,8 @@
{% extends "base.html" %}
{% block content %}
{% set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) %}
{% set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) %}
<h1>{{ section.title }}</h1>
{{ section.description | markdown | safe }}
@ -35,7 +37,7 @@
{%- if page.date %}
<small>
<time datetime="{{ page.date | date(format='%+') }}" pubdate>
{{- page.date | date(format=config.extra.date_format) -}}
{{- page.date | date(format=date_format, locale=date_locale) -}}
</time>
{%- if page.authors %}
<span>•</span>

2
templates/partials/comments.html
View File

@ -13,7 +13,7 @@
{% endif %}
{% set id = page.extra.comments.id %}
{% set date_locale = macros_translate::translate(key="date_locale", default="en-GB", language_strings=language_strings) %}
{% set date_locale = macros_translate::translate(key="date_locale", default="en-IE", language_strings=language_strings) | replace(from="_", to="-") %}
<section id="comments">
{% if config.extra.comments.show_qr %}

3
templates/partials/language_switcher.html
View File

@ -18,8 +18,7 @@
{%- set other_language_strings = load_data(path="themes/tabi/i18n/" ~ lcode ~ ".toml", required=false) -%}
{%- endif -%}
{#- Use the loaded language strings to get the language name -#}
{% set language_name = macros_translate::translate(key="language_name", default=lcode,
language_strings=other_language_strings) %}
{% set language_name = macros_translate::translate(key="language_name", default=lcode, language_strings=other_language_strings) %}
{#- Check if the language code matches the default language -#}
{%- if lcode == config.default_language -%}
{#- If it does, link to the root path (no language code in URL) -#}

4
templates/taxonomy_single.html
View File

@ -1,6 +1,8 @@
{% extends "base.html" %}
{% block content %}
{% set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) %}
{% set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) %}
{% set number_of_posts = term.pages | length %}
<h1>{{ macros_translate::translate(key="posts_with_tag", default="Posts with tag", language_strings=language_strings) }} “{{ term.name }}”</h1>
@ -34,7 +36,7 @@
{%- if page.date %}
<small>
<time datetime="{{ page.date | date(format='%+') }}" pubdate>
{{- page.date | date(format=config.extra.date_format) -}}
{{- page.date | date(format=date_format, locale=date_locale) -}}
</time>
{%- if page.authors %}
<span>•</span>