From d14dd837ec4077073ac3372cd77673c7d672d871 Mon Sep 17 00:00:00 2001 From: Alphonse Mariya Date: Sun, 26 Dec 2021 19:18:00 +0100 Subject: [PATCH] Use plural translation keys for taxonomies (#620) --- i18n/ar.toml | 22 +++++++++++----------- i18n/bn.toml | 14 +++++++------- i18n/cs.toml | 14 +++++++++----- i18n/de.toml | 15 +++++---------- i18n/en.toml | 13 ++++--------- i18n/es.toml | 15 +++++---------- i18n/fi.toml | 20 ++++++++++---------- i18n/fr.toml | 22 +++++++++++++--------- i18n/he.toml | 21 ++++++++++----------- i18n/hi.toml | 20 ++++++++++---------- i18n/hu.toml | 14 +++++++------- i18n/id.toml | 14 +++++++------- i18n/it.toml | 16 ++++++++++------ i18n/ja.toml | 14 +++++++------- i18n/ko.toml | 14 +++++++------- i18n/ms.toml | 14 +++++++++----- i18n/nl.toml | 14 +++++++------- i18n/np.toml | 20 ++++++++++---------- i18n/pl.toml | 13 ++++--------- i18n/pt-br.toml | 13 ++++--------- i18n/ro.toml | 13 ++++--------- i18n/ru.toml | 22 +++++++++++----------- i18n/se.toml | 13 ++++--------- i18n/sk.toml | 22 +++++++++++----------- i18n/sq.toml | 13 ++++--------- i18n/tr.toml | 20 ++++++++++---------- i18n/zh-cn.toml | 13 ++++--------- i18n/zh-tw.toml | 20 ++++++++++---------- layouts/_default/list.html | 5 ++--- layouts/_default/terms.html | 5 ++--- layouts/partials/list.html | 3 +-- layouts/partials/taxonomy/authors.html | 16 ++++++++-------- layouts/partials/terms.html | 5 ++--- 33 files changed, 229 insertions(+), 263 deletions(-) diff --git a/i18n/ar.toml b/i18n/ar.toml index 9db98fd..d0461c7 100644 --- a/i18n/ar.toml +++ b/i18n/ar.toml @@ -1,11 +1,17 @@ -[category] -other = "فئة" +[categories] +one = "فئة" -[tag] -other = "وَسم" +[tags] +one = "وَسم" [series] -other = "سلسلة" +one = "سلسلة" + +[authors] +one = "الكاتب" + +[posts] +other = "المنشورات" [reading_time] other = "تستغرق {{ .Count }} د" @@ -22,11 +28,5 @@ other = "بإمكانك العودة إلى homepage." [powered_by] other = "بواسطة" -[author] -other = "الكاتب" - [see_also] other = "انظر أيضاً" - -[posts] -other = "المنشورات" diff --git a/i18n/bn.toml b/i18n/bn.toml index 84d9720..e020428 100644 --- a/i18n/bn.toml +++ b/i18n/bn.toml @@ -1,14 +1,14 @@ -[category] -other = "বিভাগ" +[categories] +one = "বিভাগ" -[tag] -other = "ট্যাগ" +[tags] +one = "ট্যাগ" [series] -other = "সিরিজ" +one = "সিরিজ" -[author] -other = "লেখক" +[authors] +one = "লেখক" [posts] other = "সব পোস্ট" diff --git a/i18n/cs.toml b/i18n/cs.toml index 25ef5b3..11ba620 100644 --- a/i18n/cs.toml +++ b/i18n/cs.toml @@ -1,11 +1,15 @@ -[category] -other = "kategorie" +[categories] +one = "kategorie" -[tag] -other = "tag" +[tags] +one = "tag" [series] -other = "série" +one = "série" + +[authors] + +[posts] [reading_time] other = "Délka čtení: {{ .Count }}" diff --git a/i18n/de.toml b/i18n/de.toml index 6af652f..3fa33a1 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -1,22 +1,17 @@ -[category] -other = "Kategorie" - [categories] +one = "Kategorie" other = "Kategorien" -[tag] -other = "Tag" - [tags] +one = "Tag" other = "Tags" [series] -other = "Serie" - -[author] -other = "Autor" +one = "Serie" +other = "Serien" [authors] +one = "Autor" other = "Autoren" [posts] diff --git a/i18n/en.toml b/i18n/en.toml index e7a74f8..0e417c8 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -1,22 +1,17 @@ -[category] -other = "category" - [categories] +one = "category" other = "categories" -[tag] -other = "tag" - [tags] +one = "tag" other = "tags" [series] +one = "series" other = "series" -[author] -other = "author" - [authors] +one = "author" other = "authors" [posts] diff --git a/i18n/es.toml b/i18n/es.toml index ba6683d..396807d 100644 --- a/i18n/es.toml +++ b/i18n/es.toml @@ -1,22 +1,17 @@ -[category] -other = "categoría" - [categories] +one = "categoría" other = "categorías" -[tag] -other = "etiqueta" - [tags] +one = "etiqueta" other = "etiquetas" [series] -other = "serie" - -[author] -other = "autor" +one = "serie" +other = "series" [authors] +one = "autor" other = "autores" [posts] diff --git a/i18n/fi.toml b/i18n/fi.toml index b883f50..5e8040f 100644 --- a/i18n/fi.toml +++ b/i18n/fi.toml @@ -1,14 +1,17 @@ -[category] -other = "kategoria" +[categories] +one = "kategoria" -[tag] -other = "merkki" +[tags] +one = "merkki" [series] -other = "sarja" +one = "sarja" -[author] -other = "Kirjoittaja" +[authors] +one = "Kirjoittaja" + +[posts] +other = "Artikkelit" [reading_time] one = "Yksi lukuminuutti" @@ -28,6 +31,3 @@ other = "Tarjoaa" [see_also] other = "Katso myös" - -[posts] -other = "Artikkelit" diff --git a/i18n/fr.toml b/i18n/fr.toml index 46545ec..8e5f32e 100644 --- a/i18n/fr.toml +++ b/i18n/fr.toml @@ -1,14 +1,21 @@ -[category] -other = "catégorie" +[categories] +one = "catégorie" +other = "catégories" -[tag] -other = "tag" +[tags] +one = "tag" +other = "tags" [series] +one = "série" other = "séries" -[author] -other = "auteur" +[authors] +one = "auteur" +other = "auteurs" + +[posts] +other = "articles" [reading_time] one = "Une minute de lecture" @@ -28,6 +35,3 @@ other = "Propulsé par" [see_also] other = "Voir aussi dans" - -[posts] -other = "Articles" diff --git a/i18n/he.toml b/i18n/he.toml index ac71b5a..e3b5d04 100644 --- a/i18n/he.toml +++ b/i18n/he.toml @@ -1,14 +1,17 @@ -[category] -other = "קטגוריה" +[categories] +one = "קטגוריה" -[tag] -other = "תגית" +[tags] +one = "תגית" [series] -other = "סדרה" +one = "סדרה" -[author] -other = "סופר" +[authors] +one = "סופר" + +[posts] +other = "פוסטים" [reading_time] one = "דקה אחת לקרוא" @@ -28,7 +31,3 @@ other = "מופעל על ידי" [see_also] other = "רואה עוד ב" - -[posts] -other = "פוסטים" - diff --git a/i18n/hi.toml b/i18n/hi.toml index 9dc3f33..6bd5d8d 100644 --- a/i18n/hi.toml +++ b/i18n/hi.toml @@ -1,14 +1,17 @@ -[category] -other = "श्रेणी" +[categories] +one = "श्रेणी" -[tag] -other = "टैग" +[tags] +one = "टैग" [series] -other = "श्रृंखला" +one = "श्रृंखला" -[author] -other = "लेखक" +[authors] +one = "लेखक" + +[posts] +other = "सामग्री" [reading_time] one = "एक पढ़ने का समय" @@ -28,6 +31,3 @@ other = "द्वारा संचालित" [see_also] other = "यह भी देखें" - -[posts] -other = "सामग्री" diff --git a/i18n/hu.toml b/i18n/hu.toml index 2bdde34..51b31ad 100644 --- a/i18n/hu.toml +++ b/i18n/hu.toml @@ -1,14 +1,14 @@ -[category] -other = "Kategória" +[categories] +one = "Kategória" -[tag] -other = "Címke" +[tags] +one = "Címke" [series] -other = "Sorozat" +one = "Sorozat" -[author] -other = "Szerző" +[authors] +one = "Szerző" [posts] other = "Írások" diff --git a/i18n/id.toml b/i18n/id.toml index 4f0784b..26daff9 100644 --- a/i18n/id.toml +++ b/i18n/id.toml @@ -1,14 +1,14 @@ -[category] -other = "kategori" +[categories] +one = "kategori" -[tag] -other = "label" +[tags] +one = "label" [series] -other = "seri" +one = "seri" -[author] -other = "penulis" +[authors] +one = "penulis" [posts] other = "artikel" diff --git a/i18n/it.toml b/i18n/it.toml index a6f622a..3906bd0 100644 --- a/i18n/it.toml +++ b/i18n/it.toml @@ -1,14 +1,18 @@ -[category] -other = "categoria" +[categories] +one = "categoria" +other = "categorie" -[tag] -other = "tag" +[tags] +one = "tag" +other = "tags" [series] +one = "serie" other = "serie" -[author] -other = "autore" +[authors] +one = "autore" +other = "autori" [posts] other = "post" diff --git a/i18n/ja.toml b/i18n/ja.toml index 530f9be..33a4d6f 100644 --- a/i18n/ja.toml +++ b/i18n/ja.toml @@ -1,14 +1,14 @@ -[category] -other = "カテゴリー" +[categories] +one = "カテゴリー" -[tag] -other = "タグ" +[tags] +one = "タグ" [series] -other = "シリーズ" +one = "シリーズ" -[author] -other = "筆者" +[authors] +one = "筆者" [posts] other = "記事" diff --git a/i18n/ko.toml b/i18n/ko.toml index cce2ea2..04e4c33 100644 --- a/i18n/ko.toml +++ b/i18n/ko.toml @@ -1,14 +1,14 @@ -[category] -other = "카테고리" +[categories] +one = "카테고리" -[tag] -other = "태그" +[tags] +one = "태그" [series] -other = "시리즈" +one = "시리즈" -[author] -other = "저자" +[authors] +one = "저자" [posts] other = "포스트" diff --git a/i18n/ms.toml b/i18n/ms.toml index 0f29fc7..d92efe7 100644 --- a/i18n/ms.toml +++ b/i18n/ms.toml @@ -1,11 +1,15 @@ -[category] -other = "kategori" +[categories] +one = "kategori" -[tag] -other = "teg" +[tags] +one = "teg" [series] -other = "siri" +one = "siri" + +[authors] + +[posts] [reading_time] one = "Bacaan 1 minit" diff --git a/i18n/nl.toml b/i18n/nl.toml index 1a7cfb8..d68253b 100644 --- a/i18n/nl.toml +++ b/i18n/nl.toml @@ -1,14 +1,14 @@ -[category] -other = "Categorie" +[categories] +one = "Categorie" -[tag] -other = "Label" +[tags] +one = "Label" [series] -other = "Serie" +one = "Serie" -[author] -other = "Auteur" +[authors] +one = "Auteur" [posts] other = "Berichten" diff --git a/i18n/np.toml b/i18n/np.toml index 90a79c5..0296eaa 100644 --- a/i18n/np.toml +++ b/i18n/np.toml @@ -1,14 +1,17 @@ -[category] -other = "वर्ग" +[categories] +one = "वर्ग" -[tag] -other = "ट्याग" +[tags] +one = "ट्याग" [series] -other = "श्रृंखला" +one = "श्रृंखला" -[author] -other = "लेखक" +[authors] +one = "लेखक" + +[posts] +other = "सामग्री" [reading_time] one = "एक मिनेट पढाई" @@ -28,6 +31,3 @@ other = "द्वारा संचालित" [see_also] other = "यो पनि हेर्नुहोस।" - -[posts] -other = "सामग्री" diff --git a/i18n/pl.toml b/i18n/pl.toml index f4cfd22..8a5ea7d 100644 --- a/i18n/pl.toml +++ b/i18n/pl.toml @@ -1,22 +1,17 @@ -[category] -other = "kategoria" - [categories] +one = "kategoria" other = "kategorie" -[tag] -other = "tag" - [tags] +one = "tag" other = "tagi" [series] +one = "seria" other = "seria" -[author] -other = "autor(ka)" - [authors] +one = "autor(ka)" other = "autorzy" [posts] diff --git a/i18n/pt-br.toml b/i18n/pt-br.toml index 9f2808a..471df5d 100644 --- a/i18n/pt-br.toml +++ b/i18n/pt-br.toml @@ -1,22 +1,17 @@ -[category] -other = "categoria" - [categories] +one = "categoria" other = "categorias" -[tag] -other = "etiqueta" - [tags] +one = "etiqueta" other = "etiquetas" [series] +one = "séries" other = "séries" -[autor] -other = "autor" - [authors] +one = "autor" other = "autores" [posts] diff --git a/i18n/ro.toml b/i18n/ro.toml index 3eb6aca..4bf220b 100644 --- a/i18n/ro.toml +++ b/i18n/ro.toml @@ -1,22 +1,17 @@ -[category] -other = "categorie" - [categories] +one = "categorie" other = "categorii" -[tag] -other = "etichetă" - [tags] +one = "etichetă" other = "etichete" [series] +one = "serie" other = "serie" -[author] -other = "autor" - [authors] +one = "autor" other = "autori" [posts] diff --git a/i18n/ru.toml b/i18n/ru.toml index 13e8ed6..de4cdcb 100644 --- a/i18n/ru.toml +++ b/i18n/ru.toml @@ -1,11 +1,17 @@ -[category] -other = "категория" +[categories] +one = "категория" -[tag] -other = "тэг" +[tags] +one = "тэг" [series] -other = "серии" +one = "серии" + +[authors] +one = "автор" + +[posts] +other = "статьи" [reading_time] one = "Читать одну минуту" @@ -24,11 +30,5 @@ other = "Можете вернуться обратно на domácu stránku." [see_also] other = "Pozrite tiež" -[author] -other = "autor" - [powered_by] other = "Táto stránka bola vytvorená cez" diff --git a/i18n/sq.toml b/i18n/sq.toml index 1ac5f26..6198742 100644 --- a/i18n/sq.toml +++ b/i18n/sq.toml @@ -1,22 +1,17 @@ -[category] -other = "kategori" - [categories] +one = "kategori" other = "kategoritë" -[tag] -other = "shenjim" - [tags] +one = "shenjim" other = "shenjuesat" [series] +one = "seritë" other = "seritë" -[author] -other = "autori" - [authors] +one = "autori" other = "autorë" [posts] diff --git a/i18n/tr.toml b/i18n/tr.toml index 7436f05..ec81238 100644 --- a/i18n/tr.toml +++ b/i18n/tr.toml @@ -1,14 +1,17 @@ -[category] -other = "kategori" +[categories] +one = "kategori" -[tag] -other = "tag" +[tags] +one = "tag" [series] -other = "dizi" +one = "dizi" -[author] -other = "yazar" +[authors] +one = "yazar" + +[posts] +other = "Gönderiler" [reading_time] one = "Bir dakikalık okuma" @@ -28,6 +31,3 @@ other = "Site program altyapısı" [see_also] other = "Ayrıca bakınız" - -[posts] -other = "Gönderiler" diff --git a/i18n/zh-cn.toml b/i18n/zh-cn.toml index 9e9e6c7..fabcd78 100644 --- a/i18n/zh-cn.toml +++ b/i18n/zh-cn.toml @@ -1,22 +1,17 @@ -[category] -other = "分类" - [categories] +one = "分类" other = "分类" -[tag] -other = "标签" - [tags] +one = "标签" other = "标签" [series] +one = "系列" other = "系列" -[author] -other = "作者" - [authors] +one = "作者" other = "作者" [posts] diff --git a/i18n/zh-tw.toml b/i18n/zh-tw.toml index 654c92a..db8e02b 100644 --- a/i18n/zh-tw.toml +++ b/i18n/zh-tw.toml @@ -1,14 +1,17 @@ -[category] -other = "分類" +[categories] +one = "分類" -[tag] -other = "標籤" +[tags] +one = "標籤" [series] -other = "系列" +one = "系列" -[author] -other = "作者" +[authors] +one = "作者" + +[posts] +other = "文章" [reading_time] one = "閱讀時間 1 分鐘" @@ -28,6 +31,3 @@ other = "技術支援" [see_also] other = "參見" - -[posts] -other = "文章" \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e35b04c..cf15efb 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,10 +1,9 @@ {{ define "title" }} {{- if eq .Kind "term" -}} - {{- i18n .Data.Singular | title -}} + {{- i18n .Data.Plural 1 | title -}} {{- print ": " -}} {{- end -}} - - {{- .Title }} · {{ .Site.Title -}} + {{- i18n (lower .Title) | default .Title | title }} · {{ .Site.Title -}} {{ end }} {{ define "content" }} {{ partial "list.html" . }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 9d35888..48b37e2 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,10 +1,9 @@ {{ define "title" }} {{- if eq .Kind "term" -}} - {{- i18n .Data.Singular | title -}} + {{- i18n .Data.Plural | title -}} {{- print ": " -}} {{- end -}} - - {{- .Title }} · {{ .Site.Title -}} + {{- i18n (lower .Title) | default .Title | title }} · {{ .Site.Title -}} {{ end }} {{ define "content" }} {{ partial "terms.html" . }} diff --git a/layouts/partials/list.html b/layouts/partials/list.html index 243e1af..72d3990 100644 --- a/layouts/partials/list.html +++ b/layouts/partials/list.html @@ -2,10 +2,9 @@

{{- if eq .Kind "term" -}} - {{- i18n .Data.Singular | title -}} + {{- i18n .Data.Plural 1 | title -}} {{- print ": " -}} {{- end -}} - {{- i18n (lower .Title) | default .Title | title -}}

diff --git a/layouts/partials/taxonomy/authors.html b/layouts/partials/taxonomy/authors.html index 366d8d8..cdb7a4f 100644 --- a/layouts/partials/taxonomy/authors.html +++ b/layouts/partials/taxonomy/authors.html @@ -1,9 +1,9 @@
- - {{- range $index, $el := . -}} - {{- if gt $index 0 }} - • - {{- end }} - {{ . }} - {{- end -}} -
\ No newline at end of file + + {{- range $index, $el := . -}} + {{- if gt $index 0 }} + • + {{- end }} + {{ . }} + {{- end -}} + diff --git a/layouts/partials/terms.html b/layouts/partials/terms.html index 7d51e57..e764483 100644 --- a/layouts/partials/terms.html +++ b/layouts/partials/terms.html @@ -2,10 +2,9 @@

{{- if eq .Kind "term" -}} - {{- i18n .Data.Singular | title -}} - {{- print ": " -}} + {{- i18n .Data.Plural | title -}} + {{- print ": " -}} {{- end -}} - {{- i18n (lower .Title) | default .Title | title -}}