From acef6c143ed743415c194808f3e471edbe72a307 Mon Sep 17 00:00:00 2001 From: Dillon Date: Sat, 16 May 2020 00:46:51 +0800 Subject: [PATCH 1/8] fix(format): string format error (#366) --- layouts/_default/section.html | 4 ++-- layouts/partials/footer.html | 2 +- layouts/partials/init.html | 2 +- layouts/partials/single/footer.html | 6 +++--- layouts/posts/rss.xml | 4 ++-- layouts/taxonomy/terms.html | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 9d07c925..a743ca9c 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -1,12 +1,12 @@ {{- define "title" }} - {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} - {{ .Site.Title -}} + {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) }} - {{ .Site.Title -}} {{- end -}} {{- define "content" -}}
{{- /* Title */ -}}

- {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") -}} + {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) -}}

{{- /* Paginate */ -}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 533789c2..737c9b3b 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -12,7 +12,7 @@ {{- if ne .Site.Params.footer.hugo false -}}
{{- $hugo := printf `Hugo` hugo.Version -}} - {{- printf (T "poweredBySome") $hugo | safeHTML }} | {{ T "theme" }} - LoveIt + {{- $hugo | string | printf (T "poweredBySome" | string) | safeHTML }} | {{ T "theme" }} - LoveIt
{{- end -}} diff --git a/layouts/partials/init.html b/layouts/partials/init.html index c5b2825f..508d74d6 100644 --- a/layouts/partials/init.html +++ b/layouts/partials/init.html @@ -1,4 +1,4 @@ -{{- .Scratch.Set "version" "0.2.8" -}} +{{- .Scratch.Set "version" "0.2.9" -}} {{- /* LoveIt theme version detection */ -}} {{- $VERSION := "0.2.X" -}} diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html index 8e280186..303d70d2 100644 --- a/layouts/partials/single/footer.html +++ b/layouts/partials/single/footer.html @@ -6,7 +6,7 @@
- {{- printf (T "lastMod") $modify_date -}} + {{- $modify_date | string | printf (T "lastMod" | string) -}} {{- if .Site.Params.gitRepo -}} {{- with .GitInfo -}}   @@ -17,9 +17,9 @@
- {{- with $params.license -}} + {{- with $params.license | string -}} - {{- printf (T "license") . | safeHTML -}} + {{- printf (T "license" | string) . | safeHTML -}} {{- end -}}
diff --git a/layouts/posts/rss.xml b/layouts/posts/rss.xml index 2d3a0054..67e27941 100644 --- a/layouts/posts/rss.xml +++ b/layouts/posts/rss.xml @@ -1,13 +1,13 @@ - {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} - {{ .Site.Title -}} + {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) }} - {{ .Site.Title -}} {{- .Permalink -}} - {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} + {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) }} | {{ .Site.Title -}} Hugo -- gohugo.io {{- with .Site.LanguageCode -}} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html index 384f8b2b..f53d1ae3 100644 --- a/layouts/taxonomy/terms.html +++ b/layouts/taxonomy/terms.html @@ -1,5 +1,5 @@ {{- define "title" -}} - {{- .Params.Title | default (T .Data.Plural) | default .Data.Plural | printf (T "allSome") }} - {{ .Site.Title -}} + {{- .Params.Title | default (T .Data.Plural) | default .Data.Plural | string | printf (T "allSome" | string) }} - {{ .Site.Title -}} {{- end -}} {{- define "content" -}} @@ -10,7 +10,7 @@
{{- /* Title */ -}}

- {{- .Params.Title | default (T $taxonomies) | default $taxonomies | printf (T "allSome") -}} + {{- .Params.Title | default (T $taxonomies) | default $taxonomies | string | printf (T "allSome" | string) -}}

{{- /* Categories Page */ -}} From 36f59a72ee4c186cc525b67da6813498f43a711c Mon Sep 17 00:00:00 2001 From: Ghosin Date: Sat, 16 May 2020 00:49:47 +0800 Subject: [PATCH 2/8] fix(rss): fix self atom:link. (#363) --- layouts/index.rss.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layouts/index.rss.xml b/layouts/index.rss.xml index 8d4eef05..515f1884 100644 --- a/layouts/index.rss.xml +++ b/layouts/index.rss.xml @@ -33,7 +33,9 @@ {{- .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}} {{- end -}} - + {{ with .OutputFormats.Get "RSS" }} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{ end }} {{- range where .Site.RegularPages "Type" "posts" | first (.Site.Params.home.rss | default 10) -}} {{- dict "page" . "site" .Site | partial "rss/item.html" -}} {{- end -}} From 9c1244490f0f5596db9b6df933041af9c727dc5b Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 18 May 2020 16:10:24 +0800 Subject: [PATCH 3/8] i18n: update i18n string format (#371) --- assets/css/_partial/_single/_footer.scss | 2 ++ assets/data/social.yml | 16 ++++----- i18n/de.toml | 34 ++++++++----------- i18n/en.toml | 30 +++++++--------- i18n/es.toml | 30 +++++++--------- i18n/fr.toml | 30 +++++++--------- i18n/it.toml | 30 +++++++--------- i18n/pl.toml | 30 +++++++--------- i18n/pt-BR.toml | 28 +++++++-------- i18n/ro.toml | 30 +++++++--------- i18n/ru.toml | 30 +++++++--------- i18n/sr.toml | 30 +++++++--------- i18n/zh-CN.toml | 28 ++++++--------- layouts/404.html | 2 +- layouts/_default/section.html | 6 ++-- layouts/_default/summary.html | 30 ++++++++-------- layouts/index.json | 8 ++--- layouts/partials/comment.html | 20 +++++------ layouts/partials/footer.html | 5 +-- layouts/partials/home/profile.html | 2 +- layouts/partials/init.html | 6 ++-- layouts/partials/plugin/analytics.html | 4 +-- layouts/partials/plugin/compatibility.html | 2 +- layouts/partials/plugin/icon.html | 2 +- layouts/partials/plugin/social.html | 4 +-- layouts/partials/single/footer.html | 21 ++++++------ layouts/posts/rss.xml | 4 +-- layouts/posts/single.html | 24 ++++++------- layouts/shortcodes/style.html | 10 +++--- layouts/shortcodes/typeit.html | 2 +- layouts/shortcodes/version.html | 6 ++-- layouts/taxonomy/list.html | 4 +-- layouts/taxonomy/terms.html | 6 ++-- package.json | 2 +- ...s_d75fd08668b4bae707167bbce4d8ca46.content | 2 +- 35 files changed, 236 insertions(+), 284 deletions(-) diff --git a/assets/css/_partial/_single/_footer.scss b/assets/css/_partial/_single/_footer.scss index e6d1ed46..e2c13243 100644 --- a/assets/css/_partial/_single/_footer.scss +++ b/assets/css/_partial/_single/_footer.scss @@ -31,6 +31,8 @@ [theme=dark] & { color: $global-font-secondary-color-dark; } + + @include link(false, false); } .post-info-md { diff --git a/assets/data/social.yml b/assets/data/social.yml index 007a441a..7580005f 100644 --- a/assets/data/social.yml +++ b/assets/data/social.yml @@ -89,7 +89,7 @@ youtubechannel: # 012: Tumblr tumblr: weight: 12 - template: https://%s.tumblr.com/ + template: https://%v.tumblr.com/ title: Tumblr icon: class: fab fa-tumblr fa-fw @@ -225,7 +225,7 @@ spotify: # 029: Bandcamp bandcamp: weight: 29 - template: https://%s.bandcamp.com/ + template: https://%v.bandcamp.com/ title: Bandcamp icon: class: fab fa-bandcamp fa-fw @@ -281,7 +281,7 @@ foursquare: # 036: Hacker News hackernews: weight: 36 - template: https://news.ycombinator.com/user?id=%s + template: https://news.ycombinator.com/user?id=%v title: Hacker News icon: class: fab fa-hacker-news fa-fw @@ -385,7 +385,7 @@ jsfiddle: # 049: DeviantArt deviantart: weight: 49 - template: https://%s.deviantart.com/ + template: https://%v.deviantart.com/ title: DeviantArt icon: class: fab fa-deviantart fa-fw @@ -409,7 +409,7 @@ dribbble: # 052: WordPress wordpress: weight: 52 - template: https://%s.wordpress.com/ + template: https://%v.wordpress.com/ title: WordPress icon: class: fab fa-wordpress fa-fw @@ -425,7 +425,7 @@ vine: # 054: Google Scholar googlescholar: weight: 54 - template: https://scholar.google.com/citations?%s + template: https://scholar.google.com/citations?%v title: Google Scholar icon: simpleicons: googlescholar @@ -472,7 +472,7 @@ gitea: # 060: XMPP xmpp: weight: 60 - template: xmpp:%s + template: xmpp:%v title: XMPP icon: simpleicons: xmpp @@ -496,7 +496,7 @@ bilibili: # 063: Email email: weight: 63 - template: mailto:%s + template: mailto:%v title: Email icon: class: far fa-envelope fa-fw diff --git a/i18n/de.toml b/i18n/de.toml index 8440ea6e..1c731d11 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -17,7 +17,7 @@ other = "Artikel" # === Taxonomy === [allSome] -other = "Alle %s" +other = "Alle {{ .Some }}" [tag] other = "Tag" @@ -47,10 +47,7 @@ other = "Thema wechseln" # === partials/footer.html === [poweredBySome] -other = "Ermöglicht durch %s" - -[theme] -other = "Thema" +other = "Ermöglicht durch {{ .Hugo }} | Thema - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,33 +105,30 @@ other = "Teilen auf" [contents] other = "Inhalt" -[publish] -other = "veröffentlicht auf" +[publishedOnDate] +other = "veröffentlicht auf {{ .Date }}" -[included] -other = "enthalten in" +[includedInCategories] +other = "enthalten in {{ .Categories }}" [wordCount] -one = "Ein Wort" -other = "{{ .Count }} Wörter" +one = "Ein wort" +other = "{{ .Count }} wörter" [readingTime] -one = "Eine Minute" -other = "{{ .Count }} Minuten" +one = "Eine minute" +other = "{{ .Count }} minuten" [views] -other = "Aufrufe" +other = "aufrufe" [author] other = "Autor" -[lastMod] -other = "Aktualisiert am %s" +[updatedOnDate] +other = "Aktualisiert am {{ .Date }}" -[license] -other = "Veröffentlicht unter der %s Lizenz" - -[seeMarkdown] +[readMarkdown] other = "Markdown anzeigen" [back] diff --git a/i18n/en.toml b/i18n/en.toml index ccd8fa72..6f5a428a 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -16,7 +16,7 @@ other = "Posts" # === Taxonomy === [allSome] -other = "All %s" +other = "All {{ .Some }}" [tag] other = "Tag" @@ -46,10 +46,7 @@ other = "Switch Theme" # === partials/footer.html === [poweredBySome] -other = "Powered by %s" - -[theme] -other = "Theme" +other = "Powered by {{ .Hugo }} | Theme - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -104,17 +101,19 @@ other = "Share on" [contents] other = "Contents" -[publish] -other = "published on" +[publishedOnDate] +other = "published on {{ .Date }}" -[included] -other = "included in" +[includedInCategories] +other = "included in {{ .Categories }}" [wordCount] -other = "about {{ .Count }} words" +one = "One word" +other = "{{ .Count }} words" [readingTime] -other = "{{ .Count }} min" +one = "One minute" +other = "{{ .Count }} minutes" [views] other = "views" @@ -122,13 +121,10 @@ other = "views" [author] other = "Author" -[lastMod] -other = "The article was updated on %s" +[updatedOnDate] +other = "Updated on {{ .Date }}" -[license] -other = "Published under the %s license" - -[seeMarkdown] +[readMarkdown] other = "Read Markdown" [back] diff --git a/i18n/es.toml b/i18n/es.toml index 992f161b..b67324ab 100644 --- a/i18n/es.toml +++ b/i18n/es.toml @@ -17,7 +17,7 @@ other = "Artículos" # === Taxonomy === [allSome] -other = "Todo %s" +other = "Todo {{ .Some }}" [tag] other = "Etiqueta" @@ -47,10 +47,7 @@ other = "Cambia el tema" # === partials/footer.html === [poweredBySome] -other = "Provisto por %s" - -[theme] -other = "Tema" +other = "Provisto por {{ .Hugo }} | Tema - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,17 +105,19 @@ other = "Compartir en" [contents] other = "Contenido" -[publish] -other = "publicado el" +[publishedOnDate] +other = "publicado el {{ .Date }}" -[included] -other = "incluido en" +[includedInCategories] +other = "incluido en {{ .Categories }}" [wordCount] -other = "unas {{ .Count }} palabras" +one = "Una palabra" +other = "{{ .Count }} palabras" [readingTime] -other = "{{ .Count }} min" +one = "Un minuto" +other = "{{ .Count }} minutos" [views] other = "vistas" @@ -126,13 +125,10 @@ other = "vistas" [author] other = "Autor" -[lastMod] -other = "El artículo fue actualizado el %s" +[updatedOnDate] +other = "Actualizado el {{ .Date }}" -[license] -other = "Publicado bajo la licencia %s" - -[seeMarkdown] +[readMarkdown] other = "Leer Markdown" [back] diff --git a/i18n/fr.toml b/i18n/fr.toml index 451ad26d..541f68c5 100644 --- a/i18n/fr.toml +++ b/i18n/fr.toml @@ -17,7 +17,7 @@ other = "Posts" # === Taxonomy === [allSome] -other = "Tous %s" +other = "Tous {{ .Some }}" [tag] other = "Balise" @@ -47,10 +47,7 @@ other = "Changer de Thème" # === partials/footer.html === [poweredBySome] -other = "Propulsé par %s" - -[theme] -other = "Thème" +other = "Propulsé par {{ .Hugo }} | Thème - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,17 +105,19 @@ other = "Partager sur" [contents] other = "Contenu" -[publish] -other = "publié le" +[publishedOnDate] +other = "publié le {{ .Date }}" -[included] -other = "inclus dans" +[includedInCategories] +other = "inclus dans {{ .Categories }}" [wordCount] -other = "environ {{ .Count }} mots" +one = "Un mot" +other = "{{ .Count }} mots" [readingTime] -other = "{{ .Count }} min" +one = "Une minute" +other = "{{ .Count }} minutes" [views] other = "vues" @@ -126,13 +125,10 @@ other = "vues" [author] other = "Auteur" -[lastMod] -other = "Dernière mise à jour le %s" +[updatedOnDate] +other = "Mis à jour le {{ .Date }}" -[license] -other = "Publié sous licence %s" - -[seeMarkdown] +[readMarkdown] other = "Lire Markdown" [back] diff --git a/i18n/it.toml b/i18n/it.toml index cb24f568..2a8ea99f 100644 --- a/i18n/it.toml +++ b/i18n/it.toml @@ -17,7 +17,7 @@ other = "Articoli" # === Taxonomy === [allSome] -other = "Tutti %s" +other = "Tutti {{ .Some }}" [tag] other = "Etichetta" @@ -47,10 +47,7 @@ other = "Cambiare il tema" # === partials/footer.html === [poweredBySome] -other = "Realizzato da %s" - -[theme] -other = "Tema" +other = "Realizzato da {{ .Hugo }} | Tema - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,17 +105,19 @@ other = "Condividi su" [contents] other = "Contenuti" -[publish] -other = "pubblicato su" +[publishedOnDate] +other = "pubblicato su {{ .Date }}" -[included] -other = "incluso in" +[includedInCategories] +other = "incluso in {{ .Categories }}" [wordCount] -other = "circa {{ .Count }} parole" +one = "Una parola" +other = "{{ .Count }} parole" [readingTime] -other = "{{ .Count }} min" +one = "Un minuto" +other = "{{ .Count }} minuti" [views] other = "visualizzazioni" @@ -126,13 +125,10 @@ other = "visualizzazioni" [author] other = "Autore" -[lastMod] -other = "L'articolo è stato modificato il %s" +[updatedOnDate] +other = "Aggiornato il {{ .Date }}" -[license] -other = "Pubblicato sotto la licenza %s" - -[seeMarkdown] +[readMarkdown] other = "Leggi Markdown" [back] diff --git a/i18n/pl.toml b/i18n/pl.toml index fbe274ec..b9aa2f72 100644 --- a/i18n/pl.toml +++ b/i18n/pl.toml @@ -17,7 +17,7 @@ other = "Posty" # === Taxonomy === [allSome] -other = "Wszystkie %s" +other = "Wszystkie {{ .Some }}" [tag] other = "Tag" @@ -47,10 +47,7 @@ other = "Przełącz schemat" # === partials/footer.html === [poweredBySome] -other = "Napędzany przez %s" - -[theme] -other = "Szablon" +other = "Napędzany przez {{ .Hugo }} | Szablon - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -96,17 +93,19 @@ other = "Udostępnij na" [contents] other = "Spis treści" -[publish] -other = "opublikowano" +[publishedOnDate] +other = "opublikowano {{ .Date }}" -[included] -other = "zawarty w" +[includedInCategories] +other = "zawarty w {{ .Categories }}" [wordCount] -other = "około {{ .Count }} słów" +one = "Jedno słowo" +other = "{{ .Count }} słów" [readingTime] -other = "{{ .Count }} min" +one = "Jedna minuta" +other = "{{ .Count }} minuty" [views] other = "wyświetleń" @@ -114,13 +113,10 @@ other = "wyświetleń" [author] other = "Autor" -[lastMod] -other = "Artykuł ostatnio zaktualizowany %s" +[updatedOnDate] +other = "Zaktualizowano {{ .Date }}" -[license] -other = "Opublikowano na licencji %s" - -[seeMarkdown] +[readMarkdown] other = "Zobacz Markdown" [back] diff --git a/i18n/pt-BR.toml b/i18n/pt-BR.toml index d7653054..27cbb032 100644 --- a/i18n/pt-BR.toml +++ b/i18n/pt-BR.toml @@ -17,7 +17,7 @@ other = "Posts" # === Taxonomy === [allSome] -other = "Todos %s" +other = "Todos {{ .Some }}" [tag] other = "Tag" @@ -47,10 +47,7 @@ other = "Trocar tema" # === partials/footer.html === [poweredBySome] -other = "Movido a %s" - -[theme] -other = "Tema" +other = "Movido a {{ .Hugo }} | Tema - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,17 +105,19 @@ other = "Compartilhe em" [contents] other = "Conteúdos" -[publish] -other = "publicado em" +[publishedOnDate] +other = "publicado em {{ .Date }}" -[included] -other = "incluido em" +[includedInCategories] +other = "incluido em {{ .Categories }}" [wordCount] +one = "Uma palavra" other = "{{ .Count }} palavras" [readingTime] -other = "{{ .Count }} min" +one = "Um minuto" +other = "{{ .Count }} minutos" [views] other = "visualizações" @@ -126,13 +125,10 @@ other = "visualizações" [author] other = "Autor" -[lastMod] -other = "O artigo foi atualizado em %s" +[updatedOnDate] +other = "Atualizado em {{ .Date }}" -[license] -other = "Publicado sobre a licença %s" - -[seeMarkdown] +[readMarkdown] other = "Leia em Markdown" [back] diff --git a/i18n/ro.toml b/i18n/ro.toml index cceb805e..7584dc6f 100644 --- a/i18n/ro.toml +++ b/i18n/ro.toml @@ -17,7 +17,7 @@ other = "Articole" # === Taxonomy === [allSome] -other = "Toate %s" +other = "Toate {{ .Some }}" [tag] other = "Etichetă" @@ -47,10 +47,7 @@ other = "Schimbare Temă" # === partials/footer.html === [poweredBySome] -other = "Realizat de către %s" - -[theme] -other = "Temă" +other = "Realizat de către {{ .Hugo }} | Temă - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,17 +105,19 @@ other = "Distribuie pe" [contents] other = "Cuprins" -[publish] -other = "publicat la" +[publishedOnDate] +other = "publicat la {{ .Date }}" -[included] -other = "inclus în" +[includedInCategories] +other = "inclus în {{ .Categories }}" [wordCount] -other = "aproximativ {{ .Count }} cuvinte" +one = "Un cuvânt" +other = "{{ .Count }} cuvinte" [readingTime] -other = "{{ .Count }} min" +one = "Un minut" +other = "{{ .Count }} minute" [views] other = "vizualizări" @@ -126,13 +125,10 @@ other = "vizualizări" [author] other = "Autor" -[lastMod] -other = "Articolul a fost actualizat la %s" +[updatedOnDate] +other = "Actualizat la {{ .Date }}" -[license] -other = "Publicat sub licența %s" - -[seeMarkdown] +[readMarkdown] other = "Citire Markdown" [back] diff --git a/i18n/ru.toml b/i18n/ru.toml index 61b93093..82a01851 100644 --- a/i18n/ru.toml +++ b/i18n/ru.toml @@ -17,7 +17,7 @@ other = "Статьи" # === Taxonomy === [allSome] -other = "Все %s" +other = "Все {{ .Some }}" [tag] other = "Тэг" @@ -47,10 +47,7 @@ other = "Сменить Тему" # === partials/footer.html === [poweredBySome] -other = "Сделано %s" - -[theme] -other = "Тема" +other = "Сделано {{ .Hugo }} | Тема - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -108,17 +105,19 @@ other = "Поделиться в" [contents] other = "Содержание" -[publish] -other = "Опубликовано" +[publishedOnDate] +other = "Опубликовано {{ .Date }}" -[included] -other = "включен в" +[includedInCategories] +other = "включен в {{ .Categories }}" [wordCount] -other = "около {{ .Count }} слов" +one = "Одно слово" +other = "{{ .Count }} слов" [readingTime] -other = "{{ .Count }} мин" +one = "Одна минута" +other = "{{ .Count }} минут" [views] other = "просмотров" @@ -126,13 +125,10 @@ other = "просмотров" [author] other = "Автор" -[lastMod] -other = "Статья была обновлена %s" +[updatedOnDate] +other = "Oбновлена {{ .Date }}" -[license] -other = "Опубликовано под лицензии %s" - -[seeMarkdown] +[readMarkdown] other = "Читать Markdown" [back] diff --git a/i18n/sr.toml b/i18n/sr.toml index af8484cc..09b7d049 100644 --- a/i18n/sr.toml +++ b/i18n/sr.toml @@ -17,7 +17,7 @@ other = "Постови" # === Taxonomy === [allSome] -other = "Све %s" +other = "Све {{ .Some }}" [tag] other = "Таг" @@ -47,10 +47,7 @@ other = "Промени Тему" # === partials/footer.html === [poweredBySome] -other = "Покреће %s" - -[theme] -other = "Тема" +other = "Покреће {{ .Hugo }} | Тема - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -105,17 +102,19 @@ other = "Подели на" [contents] other = "Садржаји" -[publish] -other = "објављено" +[publishedOnDate] +other = "објављено {{ .Date }}" -[included] -other = "укључено" +[includedInCategories] +other = "укључено {{ .Categories }}" [wordCount] -other = "око {{ .Count }} речи" +one = "Једна реч" +other = "{{ .Count }} речи" [readingTime] -other = "{{ .Count }} мин" +one = "Један минут" +other = "{{ .Count }} минута" [views] other = "прегледа" @@ -123,13 +122,10 @@ other = "прегледа" [author] other = "Аутор" -[lastMod] -other = "Чланак је обновљен %s" +[updatedOnDate] +other = "Ажурирано {{ .Date }}" -[license] -other = "Објављено под условима %s лиценце" - -[seeMarkdown] +[readMarkdown] other = "Читај Markdown" [back] diff --git a/i18n/zh-CN.toml b/i18n/zh-CN.toml index b50a115b..11338ecb 100644 --- a/i18n/zh-CN.toml +++ b/i18n/zh-CN.toml @@ -17,7 +17,7 @@ other = "文章" # === Taxonomy === [allSome] -other = "所有%s" +other = "所有{{ .Some }}" [tag] other = "标签" @@ -47,10 +47,7 @@ other = "切换主题" # === partials/footer.html === [poweredBySome] -other = "由 %s 强力驱动" - -[theme] -other = "主题" +other = "由 {{ .Hugo }} 强力驱动 | 主题 - {{ .Theme }}" # === partials/footer.html === # === partials/comment.html === @@ -111,17 +108,17 @@ other = "分享到" [contents] other = "目录" -[publish] -other = "发布于" +[publishedOnDate] +other = "发布于 {{ .Date }}" -[included] -other = "收录于" +[includedInCategories] +other = "收录于 {{ .Categories }}" [wordCount] -other = "约 {{ .Count }} 字" +other = "{{ .Count }} 字" [readingTime] -other = "预计阅读 {{ .Count }} 分钟" +other = "{{ .Count }} 分钟" [views] other = "次阅读" @@ -129,13 +126,10 @@ other = "次阅读" [author] other = "作者" -[lastMod] -other = "本文于 %s 更新" +[updatedOnDate] +other = "更新于 {{ .Date }}" -[license] -other = "采用 %s 协议发布" - -[seeMarkdown] +[readMarkdown] other = "阅读原始文档" [back] diff --git a/layouts/404.html b/layouts/404.html index 59b586c6..963ae583 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,5 +1,5 @@ {{- define "title" }} - {{- T "pageNotFound" | printf "404 %s" }} - {{ .Site.Title -}} + {{- T "pageNotFound" | printf "404 %v" }} - {{ .Site.Title -}} {{- end -}} {{- define "content" -}} diff --git a/layouts/_default/section.html b/layouts/_default/section.html index a743ca9c..56943174 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -1,12 +1,12 @@ {{- define "title" }} - {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) }} - {{ .Site.Title -}} + {{- .Params.Title | default (T .Section) | default .Section | dict "Some" | T "allSome" }} - {{ .Site.Title -}} {{- end -}} {{- define "content" -}}
{{- /* Title */ -}}

- {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) -}} + {{- .Params.Title | default (T .Section) | default .Section | dict "Some" | T "allSome" -}}

{{- /* Paginate */ -}} @@ -25,7 +25,7 @@ {{- .Title -}} - {{- .Date.Format ($.Site.Params.section.dateFormat | default "01-02") -}} + {{- $.Site.Params.section.dateFormat | default "01-02" | .Date.Format -}} {{- end -}} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 7f4c12d9..fa990e14 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -23,22 +23,20 @@ {{- partial "plugin/link.html" $options -}} - {{- $publish_date := .PublishDate.Format (.Site.Params.dateFormat | default "2006-01-02") -}} -   - {{ T "publish" }}  - + {{- with .Site.Params.dateFormat | default "2006-01-02" | .PublishDate.Format -}} +   + {{- printf `` . . | dict "Date" | T "publishedOnDate" | safeHTML -}} + + {{- end -}} - {{- with .Params.categories -}} -   - - {{- T "included" -}} - {{- range $index, $value := . -}} - {{- if gt $index 0 }} {{ end -}} - {{- $category := $value | anchorize | printf "/categories/%s" | $.Site.GetPage -}} - - {{ $category.Title }} - - {{- end -}} + {{- $categories := slice -}} + {{- range .Params.categories -}} + {{- $category := . | anchorize | printf "/categories/%v" | $.Site.GetPage -}} + {{- $categories = $categories | append (printf `%v` $category.RelPermalink $category.Title) -}} + {{- end -}} + {{- with delimit $categories " " -}} +   + {{- dict "Categories" . | T "includedInCategories" | safeHTML -}} {{- end -}}
@@ -60,7 +58,7 @@   {{- range $index, $value := . -}} {{- if gt $index 0 }}, {{ end -}} - {{- $tag := $value | anchorize | printf "/tags/%s" | $.Site.GetPage -}} + {{- $tag := $value | anchorize | printf "/tags/%v" | $.Site.GetPage -}} {{ $tag.Title }} {{- end -}}
diff --git a/layouts/index.json b/layouts/index.json index c85af1f7..c78a51f9 100644 --- a/layouts/index.json +++ b/layouts/index.json @@ -12,7 +12,7 @@ {{- $uri = .Permalink -}} {{- end -}} {{- $meta := dict "uri" $uri "title" .Title "tags" .Params.tags "categories" .Params.categories -}} - {{- $meta = .PublishDate.Format ($.Site.Params.dateFormat | default "2006-01-02") | dict "date" | merge $meta -}} + {{- $meta = $.Site.Params.dateFormat | default "2006-01-02" | .PublishDate.Format | dict "date" | merge $meta -}} {{- with .Description -}} {{- $index = $index | append (dict "content" . "objectID" $uri | merge $meta) -}} {{- end -}} @@ -23,11 +23,11 @@ {{- $content = $content | replaceRE ` *\d*\n?` "" -}} {{- range $i, $contenti := split $content "

- {{- $source := printf "https://%s.disqus.com/embed.js" $disqus.shortname -}} + {{- $source := printf "https://%v.disqus.com/embed.js" $disqus.shortname -}} {{- dict "source" $source "defer" true | dict "scratch" .Scratch "data" | partial "scratch/script.html" -}}
- {{- $source := printf "https://connect.facebook.net/%s/sdk.js#xfbml=1&version=v5.0&appId=%s&autoLogAppEvents=1" ($facebook.languageCode | default (T "facebookLanguageCode")) $facebook.appId -}} + {{- $source := printf "https://connect.facebook.net/%v/sdk.js#xfbml=1&version=v5.0&appId=%v&autoLogAppEvents=1" ($facebook.languageCode | default (T "facebookLanguageCode")) $facebook.appId -}} {{- dict "source" $source "defer" true | dict "scratch" .Scratch "data" | partial "scratch/script.html" -}}