Continue previous commit

i18n/ar.toml

@@ -4,8 +4,7 @@
 # front of each translation that refers to the person and the other word that refers to the organization
 
 language_name = "العربية"  # Shown in language picker for multi-language sites.
-date_locale = "ar_SA"  # The locale code for time and date formatting.
-full_stop = "."  # Used at the end of a sentence.
+date_locale = "ar-SA"  # The locale code for time and date formatting.
 
 # Menu items.
 # Should match the names in config.extra.nav.links and config.extra.footer.links.
@@ -13,7 +12,6 @@ Blog = "المدونة"
 Demo = "العرض"
 Repo = "المستودع"
 
-anchor_link = "رابط الارتباط لـ"
 archived = "الأرشيف"
 author = "الكاتب"
 blog_post_author = "كاتب منشور المدونة"
@@ -39,13 +37,13 @@ newest_to_oldest = "من الأحدث إلى الأقدم"
 open_post = "افتح المنشور"
 page_next = "التالي"
 page_previous = "السابق"
-posts_in_total = "الوظائف في المجموع"
+posts = "الوظائف في المجموع"
 posts_with_tag = "المنشورات ذات العلامة"
 see_all_tags = "انظر جميع العلامات"
 skip_to_content = "تخطي إلى المحتوى الرئيسي"
 table_of_contents = "جدول المحتويات"
+tags_title = "العلامات"
 tags = "العلامات"
-tags_in_total = "العلامات في المجموع"
 trigger_warning = "تحذير الزناد"
 view_comment = "عرض التعليق على"
 view_profile = "عرض الملف الشخصي على"

i18n/en.toml

@@ -1,6 +1,5 @@
 language_name = "English"  # Shown in language picker for multi-language sites.
-date_locale = "en_GB"
-full_stop = "."  # Used at the end of a sentence.
+date_locale = "en-GB"
 
 # Menu items.
 # Should match the names in config.extra.nav.links and config.extra.footer.links.
@@ -8,7 +7,6 @@ Blog = "Blog"
 Demo = "Demo"
 Repo = "Repo"
 
-anchor_link = "Anchor link for"
 archived = "Archived"
 author = "Author"
 blog_post_author = "Blog post author"
@@ -34,13 +32,15 @@ newest_to_oldest = "From newest to oldest"
 open_post = "Open Post"
 page_next = "Next"
 page_previous = "Previous"
-posts_in_total = "posts in total"
+posts = "$NUMBER posts"
+one_posts = "$NUMBER post"
+many_posts = "$NUMBER posts"
 posts_with_tag = "Posts with tag"
 see_all_tags = "See all tags"
 skip_to_content = "Skip to main content"
 table_of_contents = "Table of Contents"
-tags = "Tags"
-tags_in_total = "tags in total"
+tags_title = "Tags"
+tags = "tags"
 trigger_warning = "Trigger Warning"
 view_comment = "View comment at"
 view_profile = "View profile at"

i18n/ru.toml

@@ -1,6 +1,5 @@
 language_name = "Русский"  # Shown in language picker for multi-language sites.
-date_locale = "ru_RU"
-full-stop = "."  # Used at the end of a sentence.
+date_locale = "ru-RU"
 
 # Note on pluralization prefixes:
 # - few_: for numbers ending in 2-4, except 12-14, in genitive singular.
@@ -12,7 +11,6 @@ Blog = "Блог"
 Demo = "Блог"
 Repo = "Репо"
 
-anchor_link = "Якорная ссылка для"
 archived = "Архивировано"
 author = "Автор"
 blog_post_author = "Автор блог-поста"
@@ -38,13 +36,19 @@ newest_to_oldest = "От новейшего к старейшему"
 open_post = "Открыть Пост"
 page_next = "Следующий"
 page_previous = "Предыдущий"
-posts_in_total = "всего постов"
+posts = "$NUMBER постов"
+one_posts = "$NUMBER пост"
+few_posts = "$NUMBER поста"
+many_posts = "$NUMBER постов"
 posts_with_tag = "Посты с тегом"
 see_all_tags = "Показать все теги"
 skip_to_content = "Перейти к основному содержанию"
 table_of_contents = "Оглавление"
-tags = "Теги"
-tags_in_total = "тегов в общем"
+tags_title = "Теги"
+tags = "$NUMBER тегов"
+one_tags = "$NUMBER тег"
+few_tags = "$NUMBER тега"
+many_tags = "$NUMBER тегов"
 trigger_warning = "Предупреждение о Тревоге"
 view_comment = "Показать комментарий на"
 view_profile = "Показать профиль на"

templates/partials/comments.html

@@ -13,6 +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) %}
 
 <section id="comments">
 	{% if config.extra.comments.show_qr %}
@@ -185,7 +186,7 @@
 							permalink.setAttribute("rel", "external nofollow");
 							permalink.textContent = new Date(
 								status.created_at
-							).toLocaleString("{{ config.extra.comments.locale | default(value='en-IE') }}", {
+							).toLocaleString("{{ date_locale }}", {
 								dateStyle: "long",
 								timeStyle: "short",
 							});

templates/taxonomy_list.html

@@ -2,8 +2,8 @@
 
 {% block content %}
 {% set number_of_tags = terms | length %}
-<h1>{{ macros_translate::translate(key="tags", default="Tags", language_strings=language_strings) }}</h1>
-<small>{{ terms | length }} {{ macros_translate::translate(key="tags_in_total", number=number_of_tags, default="$NUMBER tags in total", language_strings=language_strings) }}
+<h1>{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}</h1>
+<small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags in total", language_strings=language_strings) }}
 </small>
 <br />
 <ul class="tags">

templates/taxonomy_single.html

@@ -9,7 +9,7 @@
 		{{ macros_translate::translate(key="see_all_tags", default="See all tags", language_strings=language_strings) }}
 	</a>
 	<br />
-	{{ term.pages | length }} {{ macros_translate::translate(key="posts_in_total", number=number_of_posts, default="$NUMBER posts in total", language_strings=language_strings) }}
+	{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}
 </small>
 
 <div id="article-list">