i18n: update i18n string format (#371)

2020-05-18 16:10:24 +08:00
parent 36f59a72ee
commit 9c1244490f
35 changed files with 236 additions and 284 deletions
--- 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" -}}
--- 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" -}}
    <div class="page archive">
        {{- /* Title */ -}}
        <h2 class="single-title animated pulse faster">
-            {{- .Params.Title | default (T .Section) | default .Section | string | printf (T "allSome" | string) -}}
+            {{- .Params.Title | default (T .Section) | default .Section | dict "Some" | T "allSome" -}}
        </h2>

        {{- /* Paginate */ -}}
@@ -25,7 +25,7 @@
                            {{- .Title -}}
                        </a>
                        <span class="archive-item-date">
-                            {{- .Date.Format ($.Site.Params.section.dateFormat | default "01-02") -}}
+                            {{- $.Site.Params.section.dateFormat | default "01-02" | .Date.Format -}}
                        </span>
                    </article>
                {{- end -}}
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -23,22 +23,20 @@
            {{- partial "plugin/link.html" $options -}}
        </span>

-        {{- $publish_date := .PublishDate.Format (.Site.Params.dateFormat | default "2006-01-02") -}}
-        &nbsp;<span class="post-publish">
-            {{ T "publish" }}&nbsp;<time datetime={{ $publish_date }}>{{ $publish_date }}</time>
-        </span>
+        {{- with .Site.Params.dateFormat | default "2006-01-02" | .PublishDate.Format -}}
+            &nbsp;<span class="post-publish">
+                {{- printf `<time datetime="%v">%v</time>` . . | dict "Date" | T "publishedOnDate" | safeHTML -}}
+            </span>
+        {{- end -}}

-        {{- with .Params.categories -}}
-            &nbsp;
-            <span class="post-category">
-                {{- T "included" -}}
-                {{- range $index, $value := . -}}
-                    {{- if gt $index 0 }}&nbsp;{{ end -}}
-                    {{- $category := $value | anchorize | printf "/categories/%s" | $.Site.GetPage -}}
-                    <a href="{{ $category.RelPermalink }}">
-                        <i class="far fa-folder fa-fw"></i>{{ $category.Title }}
-                    </a>
-                {{- end -}}
+        {{- $categories := slice -}}
+        {{- range .Params.categories -}}
+            {{- $category := . | anchorize | printf "/categories/%v" | $.Site.GetPage -}}
+            {{- $categories = $categories | append (printf `<a href="%v"><i class="far fa-folder fa-fw"></i>%v</a>` $category.RelPermalink $category.Title) -}}
+        {{- end -}}
+        {{- with delimit $categories "&nbsp;" -}}
+            &nbsp;<span class="post-category">
+                {{- dict "Categories" . | T "includedInCategories" | safeHTML -}}
            </span>
        {{- end -}}
    </div>
@@ -60,7 +58,7 @@
                <i class="fas fa-tags fa-fw"></i>&nbsp;
                {{- range $index, $value := . -}}
                    {{- if gt $index 0 }},&nbsp;{{ end -}}
-                    {{- $tag := $value | anchorize | printf "/tags/%s" | $.Site.GetPage -}}
+                    {{- $tag := $value | anchorize | printf "/tags/%v" | $.Site.GetPage -}}
                    <a href="{{ $tag.RelPermalink }}">{{ $tag.Title }}</a>
                {{- end -}}
            </div>
--- 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 `<span class="lnt?"> *\d*\n?</span>` "" -}}
        {{- range $i, $contenti := split $content "<h2 id=" -}}
            {{- if gt $i 0 -}}
-                {{- $contenti = printf "<h2 id=%s" $contenti -}}
+                {{- $contenti = printf "<h2 id=%v" $contenti -}}
            {{- end -}}
            {{- range $j, $contentj := split $contenti "<h3 id=" -}}
                {{- if gt $j 0 -}}
-                    {{- $contentj = printf "<h3 id=%s" $contentj -}}
+                    {{- $contentj = printf "<h3 id=%v" $contentj -}}
                {{- end -}}
                {{/* Plainify, unescape and remove (\n, \t) */}}
                {{- $contentj = $contentj | plainify | htmlUnescape | replaceRE `[\n\t ]+` " " -}}
@@ -35,7 +35,7 @@
                    {{- $contentj = substr $contentj 0 $.Site.Params.search.contentLength -}}
                {{- end -}}
                {{- if $contentj | and (ne $contentj " ") -}}
-                    {{- $one := printf "%s:%d:%d" $uri $i $j | dict "content" $contentj "objectID" | merge $meta -}}
+                    {{- $one := printf "%v:%v:%v" $uri $i $j | dict "content" $contentj "objectID" | merge $meta -}}
                    {{- $index = $index | append $one -}}
                {{- end -}}
            {{- end -}}
--- a/layouts/partials/comment.html
+++ b/layouts/partials/comment.html
@@ -9,7 +9,7 @@
        {{- $disqus := $comment.disqus | default dict -}}
        {{- if $disqus.enable -}}
            <div id="disqus_thread" class="comment"></div>
-            {{- $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" -}}
            <noscript>
                Please enable JavaScript to view the comments powered by <a href="https://disqus.com/?ref_noscript">Disqus</a>.
@@ -51,7 +51,7 @@
            {{- with $valine.serverURLs -}}
                {{- $commentConfig = dict "serverURLs" . | dict "valine" | merge $commentConfig -}}
            {{- end -}}
-            {{- $commentConfig = $valine.emoji | default "google.yml" | printf "data/emoji/%s" | resources.Get | transform.Unmarshal | dict "valine" | merge $commentConfig -}}
+            {{- $commentConfig = $valine.emoji | default "google.yml" | printf "data/emoji/%v" | resources.Get | transform.Unmarshal | dict "valine" | merge $commentConfig -}}
            <noscript>
                Please enable JavaScript to view the comments powered by <a href="https://valine.js.org/">Valine</a>.
            </noscript>
@@ -67,7 +67,7 @@
                data-width="{{ $facebook.width }}"
                data-numposts="{{ $facebook.numPosts }}"
            ></div>
-            {{- $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" -}}
            <noscript>
                Please enable JavaScript to view the comments powered by <a href="https://developers.facebook.com/docs/plugins/comments/"></a>Facebook</a>.
@@ -78,22 +78,22 @@
        {{- $telegram := $comment.telegram | default dict -}}
        {{- if $telegram.enable -}}
            <div id="telegram-comments" class="comment"></div>
-            {{- $attr := printf `data-comments-app-website="%s"` $telegram.siteID -}}
-            {{- $attr = printf `%s data-limit="%s"` $attr ($telegram.limit | default 5) -}}
+            {{- $attr := printf `data-comments-app-website="%v"` $telegram.siteID -}}
+            {{- $attr = printf `%v data-limit="%v"` $attr ($telegram.limit | default 5) -}}
            {{- with $telegram.height -}}
-                {{- $attr = printf `%s data-height="%s"` $attr . -}}
+                {{- $attr = printf `%v data-height="%v"` $attr . -}}
            {{- end -}}
            {{- with $telegram.color -}}
-                {{- $attr = printf `%s data-color="%s"` $attr . -}}
+                {{- $attr = printf `%v data-color="%v"` $attr . -}}
            {{- end -}}
            {{- if $telegram.colorful -}}
-                {{- $attr = printf `%s data-colorful="1"` $attr -}}
+                {{- $attr = printf `%v data-colorful="1"` $attr -}}
            {{- end -}}
            {{- if $telegram.dislikes -}}
-                {{- $attr = printf `%s data-dislikes="1"` $attr -}}
+                {{- $attr = printf `%v data-dislikes="1"` $attr -}}
            {{- end -}}
            {{- if $telegram.outlined -}}
-                {{- $attr = printf `%s data-outlined="1"` $attr -}}
+                {{- $attr = printf `%v data-outlined="1"` $attr -}}
            {{- end -}}
            {{- dict "source" "https://comments.app/js/widget.js?2" "defer" true "attr" $attr | dict "scratch" .Scratch "data" | partial "scratch/script.html" -}}
            <noscript>
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -11,8 +11,9 @@
            {{- /* Hugo and LoveIt */ -}}
            {{- if ne .Site.Params.footer.hugo false -}}
                <div class="footer-line">
-                    {{- $hugo := printf `<a href="https://gohugo.io/" target="_blank" rel="noopener noreffer" title="Hugo %s">Hugo</a>` hugo.Version -}}
-                    {{- $hugo | string | printf (T "poweredBySome" | string) | safeHTML }} | {{ T "theme" }} - <a href="https://github.com/dillonzq/LoveIt" target="_blank" rel="noopener noreffer" title="LoveIt {{ .Scratch.Get `version` }}"><i class="far fa-kiss-wink-heart fa-fw"></i> LoveIt</a>
+                    {{- $hugo := printf `<a href="https://gohugo.io/" target="_blank" rel="noopener noreffer" title="Hugo %v">Hugo</a>` hugo.Version -}}
+                    {{- $theme := .Scratch.Get "version" | printf `<a href="https://github.com/dillonzq/LoveIt" target="_blank" rel="noopener noreffer" title="LoveIt %v"><i class="far fa-kiss-wink-heart fa-fw"></i> LoveIt</a>` -}}
+                    {{- dict "Hugo" $hugo "Theme" $theme | T "poweredBySome" | safeHTML }}
                </div>
            {{- end -}}

--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -2,7 +2,7 @@
 <div class="home-profile">
    {{- $avatar := $profile.avatarURL -}}
    {{- with $profile.gravatarEmail -}}
-        {{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%s?s=240&d=mp" -}}
+        {{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%v?s=240&d=mp" -}}
    {{- end -}}
    {{- if $avatar -}}
        <div class="home-avatar">
--- a/layouts/partials/init.html
+++ b/layouts/partials/init.html
@@ -6,7 +6,7 @@
    {{- if not .Site.Params.version -}}
        {{- errorf "Configuration Error 配置文件错误\n\nYou haven't configured the LoveIt version param correctly yet. See https://hugoloveit.com/theme-documentation-basics/#basic-configuration\n你还没有正确配置 LoveIt 的版本参数. 参考 https://hugoloveit.com/zh-cn/theme-documentation-basics/#basic-configuration\n" -}}
    {{- else if ne .Site.Params.version $VERSION -}}
-        {{- errorf (printf "Compatibility Error 兼容性错误\n\n%s -> %s:\nYou have an incompatible update. See https://github.com/dillonzq/LoveIt/releases\n你进行了一次不兼容的更新. 参考 https://github.com/dillonzq/LoveIt/releases\n" .Site.Params.version $VERSION) -}}
+        {{- errorf (printf "Compatibility Error 兼容性错误\n\n%v -> %v:\nYou have an incompatible update. See https://github.com/dillonzq/LoveIt/releases\n你进行了一次不兼容的更新. 参考 https://github.com/dillonzq/LoveIt/releases\n" .Site.Params.version $VERSION) -}}
    {{- end -}}
 {{- end -}}

@@ -15,11 +15,11 @@
 {{- if eq hugo.Environment "production" -}}
    {{- $cdn := .Site.Params.cdn -}}
    {{- with $cdn.data -}}
-        {{- $cdnData := printf "data/cdn/%s" . | resources.Get | transform.Unmarshal -}}
+        {{- $cdnData := printf "data/cdn/%v" . | resources.Get | transform.Unmarshal -}}
        {{- $cdn = dict "simpleIconsPrefix" $cdnData.prefix.simpleIcons -}}
        {{- $prefix := $cdnData.prefix.libFiles | default "" -}}
        {{- range $key, $value := $cdnData.libFiles -}}
-            {{- $cdn = printf "%s%s" $prefix $value | dict $key | merge $cdn -}}
+            {{- $cdn = printf "%v%v" $prefix $value | dict $key | merge $cdn -}}
        {{- end -}}
    {{- end -}}
    {{- .Scratch.Set "cdn" $cdn -}}
--- a/layouts/partials/plugin/analytics.html
+++ b/layouts/partials/plugin/analytics.html
@@ -5,7 +5,7 @@
            window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());
            gtag('config', '{{ . }}'{{ if $.google.anonymizeIP }}, { 'anonymize_ip': true }{{ end }});
        </script>
-        {{- printf "https://www.googletagmanager.com/gtag/js?id=%s" . | dict "async" true "source" | partial "plugin/script.html" -}}
+        {{- printf "https://www.googletagmanager.com/gtag/js?id=%v" . | dict "async" true "source" | partial "plugin/script.html" -}}
    {{- end -}}

    {{- /* Fathom Analytics */ -}}
@@ -15,6 +15,6 @@
            fathom('set', 'siteId', '{{ . }}');
            fathom('trackPageview');
        </script>
-        {{- dict "source" ($.fathom.server | default "cdn.usefathom.com" | printf "https://%s/tracker.js") "async" true "attr" "id=fathom-script" | partial "plugin/script.html" -}}
+        {{- dict "source" ($.fathom.server | default "cdn.usefathom.com" | printf "https://%v/tracker.js") "async" true "attr" "id=fathom-script" | partial "plugin/script.html" -}}
    {{- end -}}
 {{- end -}}
--- a/layouts/partials/plugin/compatibility.html
+++ b/layouts/partials/plugin/compatibility.html
@@ -11,7 +11,7 @@
        {{- end -}}
    {{- end -}}
    {{- with $features | uniq -}}
-        {{- delimit . "%2C" | printf "https://polyfill.io/v3/polyfill.min.js?features=%s" | dict "source" | dict "scratch" $.Scratch "data" | partial "scratch/script.html" -}}
+        {{- delimit . "%2C" | printf "https://polyfill.io/v3/polyfill.min.js?features=%v" | dict "source" | dict "scratch" $.Scratch "data" | partial "scratch/script.html" -}}
    {{- end -}}
 {{- end -}}

--- a/layouts/partials/plugin/icon.html
+++ b/layouts/partials/plugin/icon.html
@@ -8,7 +8,7 @@
            {{- $prefix = . -}}
        {{- end -}}
        {{- $prefix = $prefix | strings.TrimSuffix "/" -}}
-        {{- $src = printf "%s/%s.svg" $prefix . -}}
+        {{- $src = printf "%v/%v.svg" $prefix . -}}
    {{- end -}}
    {{- if (urls.Parse $src).Host | not -}}
        {{- $src = (resources.Get $src | minify).RelPermalink -}}
--- a/layouts/partials/plugin/social.html
+++ b/layouts/partials/plugin/social.html
@@ -2,9 +2,9 @@
 {{- with .url -}}
    {{- $href = . | relLangURL -}}
 {{- else -}}
-    {{- $template := .template | default "%s" -}}
+    {{- $template := .template | default "%v" -}}
    {{- with .prefix -}}
-        {{- $template = . | strings.TrimSuffix "/" | printf "%s/%%s" -}}
+        {{- $template = . | strings.TrimSuffix "/" | printf "%v/%%v" -}}
    {{- end -}}
    {{- $href = printf (string $template) .id -}}
 {{- end -}}
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -1,17 +1,18 @@
 {{- $params := .Scratch.Get "params" -}}
-{{- $modify_date := .Lastmod.Format (.Site.Params.dateformat | default "2006-01-02") -}}

 <div class="post-footer" id="post-footer">
    <div class="post-info">
        <div class="post-info-line">
            <div class="post-info-mod">
                <span>
-                    {{- $modify_date | string | printf (T "lastMod" | string) -}}
-                    {{- if .Site.Params.gitRepo -}}
-                        {{- with .GitInfo -}}
-                            &nbsp;<a class="git-hash" href="{{ printf `%s/commit/%s` $.Site.Params.gitRepo .Hash }}" target="_blank" title="commit by {{ .AuthorName }}({{ .AuthorEmail }}) {{ .Hash }}: {{ .Subject }}">
-                                <i class="fas fa-hashtag fa-fw"></i>{{- .AbbreviatedHash -}}
-                            </a>
+                    {{- with .Site.Params.dateformat | default "2006-01-02" | .Lastmod.Format -}}
+                        {{- dict "Date" . | T "updatedOnDate" -}}
+                        {{- if $.Site.Params.gitRepo -}}
+                            {{- with $.GitInfo -}}
+                                &nbsp;<a class="git-hash" href="{{ printf `%v/commit/%v` $.Site.Params.gitRepo .Hash }}" target="_blank" title="commit by {{ .AuthorName }}({{ .AuthorEmail }}) {{ .Hash }}: {{ .Subject }}">
+                                    <i class="fas fa-hashtag fa-fw"></i>{{- .AbbreviatedHash -}}
+                                </a>
+                            {{- end -}}
                        {{- end -}}
                    {{- end -}}
                </span>
@@ -19,7 +20,7 @@
            <div class="post-info-license">
                {{- with $params.license | string -}}
                    <span>
-                        {{- printf (T "license" | string) . | safeHTML -}}
+                        {{- . | safeHTML -}}
                    </span>
                {{- end -}}
            </div>
@@ -30,7 +31,7 @@
                    {{- with .OutputFormats.Get "markdown" -}}
                        <span>
                            <a class="link-to-markdown" href="{{ .RelPermalink }}" target="_blank">
-                                {{- T "seeMarkdown" -}}
+                                {{- T "readMarkdown" -}}
                            </a>
                        </span>
                    {{- end -}}
@@ -50,7 +51,7 @@
                <i class="fas fa-tags fa-fw"></i>&nbsp;
                {{- range $index, $value := . -}}
                    {{- if gt $index 0 }},&nbsp;{{ end -}}
-                    {{- $tag := $value | anchorize | printf "/tags/%s" | $.Site.GetPage -}}
+                    {{- $tag := $value | anchorize | printf "/tags/%v" | $.Site.GetPage -}}
                    <a href="{{ $tag.RelPermalink }}">{{ $tag.Title }}</a>
                {{- end -}}
            {{- end -}}
--- a/layouts/posts/rss.xml
+++ b/layouts/posts/rss.xml
@@ -1,13 +1,13 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
    <channel>
        <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 -}}
        </title>
        <link>
            {{- .Permalink -}}
        </link>
        <description>
-            {{- .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 -}}
        </description>
        <generator>Hugo -- gohugo.io</generator>
        {{- with .Site.LanguageCode -}}
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -37,23 +37,21 @@
                    {{- partial "plugin/link.html" $options -}}
                </span>

-                {{- with .Params.categories -}}
-                    &nbsp;
-                    <span class="post-category">
-                        {{- T "included" -}}
-                        {{- range $index, $value := . -}}
-                            {{- if gt $index 0 }}&nbsp;{{ end -}}
-                            {{- $category := $value | anchorize | printf "/categories/%s" | $.Site.GetPage -}}
-                            <a href="{{ $category.RelPermalink }}">
-                                <i class="far fa-folder fa-fw"></i>{{ $category.Title }}
-                            </a>
-                        {{- end -}}
+                {{- $categories := slice -}}
+                {{- range .Params.categories -}}
+                    {{- $category := . | anchorize | printf "/categories/%v" | $.Site.GetPage -}}
+                    {{- $categories = $categories | append (printf `<a href="%v"><i class="far fa-folder fa-fw"></i>%v</a>` $category.RelPermalink $category.Title) -}}
+                {{- end -}}
+                {{- with delimit $categories "&nbsp;" -}}
+                    &nbsp;<span class="post-category">
+                        {{- dict "Categories" . | T "includedInCategories" | safeHTML -}}
                    </span>
                {{- end -}}
            </div>
            <div class="post-meta-line">
-                {{- $publish_date := .PublishDate.Format (.Site.Params.dateformat | default "2006-01-02") -}}
-                <i class="far fa-calendar-alt fa-fw"></i>&nbsp;<time datetime={{ $publish_date }}>{{ $publish_date }}</time>&nbsp;
+                {{- with .Site.Params.dateformat | default "2006-01-02" | .PublishDate.Format -}}
+                    <i class="far fa-calendar-alt fa-fw"></i>&nbsp;<time datetime="{{ . }}">{{ . }}</time>&nbsp;
+                {{- end -}}
                <i class="fas fa-pencil-alt fa-fw"></i>&nbsp;{{ T "wordCount" .WordCount }}&nbsp;
                <i class="far fa-clock fa-fw"></i>&nbsp;{{ T "readingTime" .ReadingTime }}&nbsp;
                {{- $comment := .Scratch.Get "comment" | default dict -}}
--- a/layouts/shortcodes/style.html
+++ b/layouts/shortcodes/style.html
@@ -1,11 +1,11 @@
 {{- $content := .Inner | .Page.RenderString -}}
 {{- $id := dict "scratch" .Page.Scratch | partial "function/id.html" -}}
 {{- $tag := .Get 1 | default "div" -}}
-{{- printf `<%s id="%s">%s</%s>` $tag $id $content $tag | safeHTML -}}
+{{- printf `<%v id="%v">%v</%v>` $tag $id $content $tag | safeHTML -}}

-{{- $style := .Get 0 | printf "#%s{%s}" $id -}}
-{{- $path := printf "style/%s/%s" (md5 .Page.RelPermalink) $id -}}
-{{- $res := resources.FromString (printf "%s.scss" $path) $style -}}
-{{- $res = $res | toCSS (dict "targetPath" (printf "%s.css" $path) "outputStyle" "compressed") -}}
+{{- $style := .Get 0 | printf "#%v{%v}" $id -}}
+{{- $path := printf "style/%v/%v" (md5 .Page.RelPermalink) $id -}}
+{{- $res := resources.FromString (printf "%v.scss" $path) $style -}}
+{{- $res = $res | toCSS (dict "targetPath" (printf "%v.css" $path) "outputStyle" "compressed") -}}
 {{- $styleArr := (.Page.Scratch.Get "this").styleArr | default slice -}}
 {{- $styleArr | append $res.Content | .Page.Scratch.SetInMap "this" "styleArr" -}}
--- a/layouts/shortcodes/typeit.html
+++ b/layouts/shortcodes/typeit.html
@@ -27,5 +27,5 @@
 {{- dict $key $group | merge $typeitMap | .Page.Scratch.SetInMap "this" "typeitMap" -}}

 <div class="typeit">
-    {{- printf `<%s id="%s" class="%s"></%s>` $tag $id (delimit $classList " ") $tag | safeHTML -}}
+    {{- printf `<%v id="%v" class="%v"></%v>` $tag $id (delimit $classList " ") $tag | safeHTML -}}
 </div>
--- a/layouts/shortcodes/version.html
+++ b/layouts/shortcodes/version.html
@@ -1,13 +1,13 @@
 {{- $version := .Get 0 -}}
-{{- $url := printf "https://github.com/dillonzq/LoveIt/releases/tag/v%s" $version -}}
+{{- $url := printf "https://github.com/dillonzq/LoveIt/releases/tag/v%v" $version -}}
 {{- $type := .Get 1 | default "new" | lower -}}
 {{- $label := T $type -}}
 {{- $color := cond (eq $type "changed") "ff9101" "00b1ff" | cond (eq $type "deleted") "ff5252" -}}
-{{- $pathTemplate := cond .Site.IsMultiLingual (printf "svg/version/%%s-%%s.%s.svg" .Page.Language.Lang) "svg/version/%s-%s.svg" -}}
+{{- $pathTemplate := cond .Site.IsMultiLingual (printf "svg/version/%%v-%%v.%v.svg" .Page.Language.Lang) "svg/version/%v-%v.svg" -}}
 {{- $path := printf $pathTemplate $version $type -}}
 {{- $res := resources.Get "svg/version.template.svg" -}}
 {{- $res = $res | resources.ExecuteAsTemplate $path (dict "version" $version "label" $label "color" $color) | minify -}}
-{{- $alt := printf "LoveIt %s | %s" $label $version -}}
+{{- $alt := printf "LoveIt %v | %v" $label $version -}}
 <a href="{{ $url }}" rel="noopener noreffer" target="_blank">
    {{- dict "src" $res.RelPermalink "alt" $alt "class" "version" | partial "plugin/image.html" -}}
 </a>
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -12,7 +12,7 @@
            {{- else if eq $taxonomy "tag" -}}
                <i class="fas fa-tag fa-fw"></i>&nbsp;{{ .Title }}
            {{- else -}}
-                {{- printf "%s - %s" (T $taxonomy | default $taxonomy) .Title -}}
+                {{- printf "%v - %v" (T $taxonomy | default $taxonomy) .Title -}}
            {{- end -}}
        </h2>

@@ -32,7 +32,7 @@
                            {{- .Title -}}
                        </a>
                        <span class="archive-item-date">
-                            {{- .Date.Format ($.Site.Params.list.dateFormat | default "01-02") -}}
+                            {{- $.Site.Params.list.dateFormat | default "01-02" | .Date.Format -}}
                        </span>
                    </article>
                {{- end -}}
--- 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 | string | printf (T "allSome" | string) }} - {{ .Site.Title -}}
+    {{- .Params.Title | default (T .Data.Plural) | default .Data.Plural | dict "Some" | T "allSome" }} - {{ .Site.Title -}}
 {{- end -}}

 {{- define "content" -}}
@@ -10,7 +10,7 @@
    <div class="page archive">
        {{- /* Title */ -}}
        <h2 class="single-title animated pulse faster">
-            {{- .Params.Title | default (T $taxonomies) | default $taxonomies | string | printf (T "allSome" | string) -}}
+            {{- .Params.Title | default (T $taxonomies) | default $taxonomies | dict "Some" | T "allSome" -}}
        </h2>

        {{- /* Categories Page */ -}}
@@ -19,7 +19,7 @@
                {{- range $terms -}}
                    {{- $term := .Term -}}
                    {{- $pages := .Pages -}}
-                    {{- with $.Site.GetPage "taxonomy" (printf "%s/%s" $type $term) -}}
+                    {{- with $.Site.GetPage "taxonomy" (printf "%v/%v" $type $term) -}}
                    <div class="card-item">
                        <div class="card-item-wrapper">
                            <h3 class="card-item-title">