From eebd5ade09c916e82f612b17fa7eba6c2d55b031 Mon Sep 17 00:00:00 2001 From: ciallowo <76084546+ciallowo@users.noreply.github.com> Date: Mon, 7 Jun 2021 22:50:14 +0800 Subject: [PATCH 1/6] fix: waline client config --- exampleSite/config.yaml | 16 +++++++-------- .../partials/comments/provider/waline.html | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 9fa81ff..2b5fbe6 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -67,18 +67,18 @@ params: clientId: clientSecret: - # Waline 前端配置参见 https://waline.js.org/client/basic.html - # Waline client configuration see: https://waline.js.org/en/client/basic.html + # Waline 前端配置参见 https://waline.js.org/reference/client.html + # Waline client configuration see: https://waline.js.org/en/reference/client.html waline: serverURL: - placeholder: - wordLimit: + lang: + visitor: avatar: - avatarCDN: - emojiCDN: - guest_info: "nick,mail,link" - requiredFields: + emoji: + dark: auto admin: + requiredMeta: + placeholder: widgets: enabled: diff --git a/layouts/partials/comments/provider/waline.html b/layouts/partials/comments/provider/waline.html index 76db47e..6c757ec 100644 --- a/layouts/partials/comments/provider/waline.html +++ b/layouts/partials/comments/provider/waline.html @@ -11,20 +11,20 @@ {{- with .Site.Params.comments.waline -}} From 45b16a0bb4f1edc5e8c623ffe49a56848cb46127 Mon Sep 17 00:00:00 2001 From: k <68973000+moll-y@users.noreply.github.com> Date: Sat, 12 Jun 2021 02:24:59 -0500 Subject: [PATCH 2/6] fix(typo): change 'a ex.*' for 'an ex.*' (#213) In order to fix this kind of typo, the (not sophisticated) Regular Expression: `[a-zA-Z] [aA] [aeiouAEIOU]` was ran. That Regular Expression matches some good written sentences like `a User`, therefore, those has been omitted. --- exampleSite/content/categories/Test/_index.md | 4 ++-- layouts/partials/helper/image.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exampleSite/content/categories/Test/_index.md b/exampleSite/content/categories/Test/_index.md index 0b3cfa9..de42112 100644 --- a/exampleSite/content/categories/Test/_index.md +++ b/exampleSite/content/categories/Test/_index.md @@ -1,9 +1,9 @@ --- title: "Test" -description: "This is a example category" +description: "This is an example category" slug: "test" image: "hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg" style: background: "#2a9d8f" color: "#fff" ---- \ No newline at end of file +--- diff --git a/layouts/partials/helper/image.html b/layouts/partials/helper/image.html index dd86d27..11fc3b6 100644 --- a/layouts/partials/helper/image.html +++ b/layouts/partials/helper/image.html @@ -8,7 +8,7 @@ {{ $url := urls.Parse $imageValue }} {{ if or (eq $url.Scheme "http") (eq $url.Scheme "https") }} - + {{ $result = merge $result (dict "permalink" $imageValue) }} {{ else }} {{ $pageResourceImage := .Context.Resources.GetMatch (printf "%s" ($imageValue | safeURL)) }} @@ -58,4 +58,4 @@ {{ end }} -{{ return $result }} \ No newline at end of file +{{ return $result }} From 159cc305700bb0f5b75b37f479905f2b9a784dd2 Mon Sep 17 00:00:00 2001 From: Masakazu Araki <26180919+mkaraki@users.noreply.github.com> Date: Sat, 12 Jun 2021 16:28:43 +0900 Subject: [PATCH 3/6] fix(i18n): Japanese translating (#212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "サーチ" is not good translate for this situation. --- i18n/ja.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/ja.yaml b/i18n/ja.yaml index e9744c2..b39f87c 100644 --- a/i18n/ja.yaml +++ b/i18n/ja.yaml @@ -28,7 +28,7 @@ widget: search: title: - other: サーチ + other: 検索 placeholder: other: 入力... resultTitle: From 2c0bf8c940a6b11ed1945b8f93174c3c02e3ab2c Mon Sep 17 00:00:00 2001 From: zhixuan <59254886+zhixuan666@users.noreply.github.com> Date: Sat, 12 Jun 2021 16:51:31 +0900 Subject: [PATCH 4/6] feat: Add support for Google Analytics v4 (#214) --- layouts/partials/head/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html index fd9ef73..4d89b89 100644 --- a/layouts/partials/head/head.html +++ b/layouts/partials/head/head.html @@ -21,5 +21,5 @@ {{ end }} -{{- template "_internal/google_analytics_async.html" . -}} +{{- template "_internal/google_analytics.html" . -}} {{- partial "head/custom.html" . -}} From ea0bdeca5d1fc401a8ac0c19f4d279f9f9aabd9e Mon Sep 17 00:00:00 2001 From: zhixuan Date: Sun, 13 Jun 2021 12:42:44 +0900 Subject: [PATCH 5/6] #200#issuecomment-860025299 --- exampleSite/config.yaml | 11 ++++-- .../partials/comments/provider/waline.html | 37 ++++++++++--------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 2b5fbe6..cb2af39 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -70,15 +70,20 @@ params: # Waline 前端配置参见 https://waline.js.org/reference/client.html # Waline client configuration see: https://waline.js.org/en/reference/client.html waline: - serverURL: + serverURL: lang: visitor: avatar: emoji: - dark: auto - admin: + - emoji URL 1 + - emoji URL 2 requiredMeta: + - name + - email + - url placeholder: + locale: + admin: test widgets: enabled: diff --git a/layouts/partials/comments/provider/waline.html b/layouts/partials/comments/provider/waline.html index 6c757ec..d4b418f 100644 --- a/layouts/partials/comments/provider/waline.html +++ b/layouts/partials/comments/provider/waline.html @@ -7,25 +7,26 @@ box-shadow: var(--shadow-l1); padding: var(--card-padding); } + .waline-container .vcount { + color: var(--card-text-color-main); + } {{- with .Site.Params.comments.waline -}} - +{{- $config := dict "el" "#waline" "dark" "body[data-scheme=\"dark\"]" -}} +{{- $replaceKeys := dict "serverurl" "serverURL" "requiredmeta" "requiredMeta" "wordlimit" "wordLimit" "pagesize" "pageSize" "avatarcdn" "avatarCDN" "avatarforce" "avatarForce" -}} + +{{- range $key, $val := . -}} + {{- if $val -}} + {{- $replaceKey := index $replaceKeys $key -}} + {{- $k := default $key $replaceKey -}} + + {{- $config = merge $config (dict $k $val) -}} + {{- end -}} {{- end -}} + + +{{- end -}} \ No newline at end of file From fea48eba5e376626f3d188c649e8304cd084e88b Mon Sep 17 00:00:00 2001 From: zhixuan Date: Sun, 13 Jun 2021 12:45:27 +0900 Subject: [PATCH 6/6] Update config.yaml --- exampleSite/config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 81b6851..cb2af39 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -70,7 +70,6 @@ params: # Waline 前端配置参见 https://waline.js.org/reference/client.html # Waline client configuration see: https://waline.js.org/en/reference/client.html waline: - serverURL: lang: visitor: