From 6f9c51fa5d33788dc80658b4ded0cb943b62971e Mon Sep 17 00:00:00 2001 From: daudix Date: Sun, 30 Jun 2024 21:02:01 +0300 Subject: [PATCH] Make the default locale en_US instead of en_IE en_US is way more common and usual for most people than the weird European en_IE (I do like it but that's just me) --- i18n/en.toml | 4 ++-- templates/article.html | 4 ++-- templates/article_list.html | 4 ++-- templates/partials/comments.html | 2 +- templates/partials/head.html | 2 +- templates/taxonomy_single.html | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/i18n/en.toml b/i18n/en.toml index 134f81e..7b3234a 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -4,8 +4,8 @@ language_name = "English" # (post publication date, tag posts list...). # Not used in comments, "date_locale" is used instead. # See https://docs.rs/chrono/0.4.31/chrono/format/strftime/index.html -date_format = "%d %B %Y" -date_locale = "en_IE" +date_format = "%B %d, %Y" +date_locale = "en_US" # Menu items. # Should match the names in config.extra.nav.links and config.extra.footer.links. diff --git a/templates/article.html b/templates/article.html index 3748b75..92ae0b7 100644 --- a/templates/article.html +++ b/templates/article.html @@ -1,8 +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 date_format = macros_translate::translate(key="date_format", default="%B %d, %Y", language_strings=language_strings) -%} +{%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}

{{ page.title }}

diff --git a/templates/article_list.html b/templates/article_list.html index ef24d28..d8c57c2 100644 --- a/templates/article_list.html +++ b/templates/article_list.html @@ -1,8 +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 date_format = macros_translate::translate(key="date_format", default="%B %d, %Y", language_strings=language_strings) -%} +{%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}

{{ section.title }}

{{ section.description | markdown | safe }} diff --git a/templates/partials/comments.html b/templates/partials/comments.html index 6192520..8e328ee 100644 --- a/templates/partials/comments.html +++ b/templates/partials/comments.html @@ -13,7 +13,7 @@ {%- endif -%} {%- set id = page.extra.comments.id -%} -{%- set date_locale = macros_translate::translate(key="date_locale", default="en-IE", language_strings=language_strings) | replace(from="_", to="-") -%} +{%- set date_locale = macros_translate::translate(key="date_locale", default="en-US", language_strings=language_strings) | replace(from="_", to="-") -%}
{%- if config.extra.comments.show_qr -%} diff --git a/templates/partials/head.html b/templates/partials/head.html index 7a71d3d..a6f5079 100644 --- a/templates/partials/head.html +++ b/templates/partials/head.html @@ -94,5 +94,5 @@ - + diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html index 49ebf64..7a1e5a2 100644 --- a/templates/taxonomy_single.html +++ b/templates/taxonomy_single.html @@ -1,8 +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 date_format = macros_translate::translate(key="date_format", default="%B %d, %Y", language_strings=language_strings) -%} +{%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%} {%- set number_of_posts = term.pages | length -%}

{{ macros_translate::translate(key="posts_with_tag", default="Posts with tag", language_strings=language_strings) }} “{{ term.name }}”