From cedd6f17a225753e1b568dfea7cfadf41b2b7fb7 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 4 Mar 2020 11:55:33 +0800 Subject: [PATCH] fix(i18n): fix mobile i18n link error and zh -> zh-CN --- assets/css/style.template.scss | 2 +- exampleSite/config.toml | 42 +++++++++---------- .../content/{about.zh.md => about.zh-cn.md} | 0 ....zh.md => Basic-Markdown-Preview.zh-cn.md} | 0 ...st-mermaid.zh.md => test-mermaid.zh-cn.md} | 0 .../posts/{test.zh.md => test.zh-cn.md} | 0 ...md => theme-documentation-basics.zh-cn.md} | 0 i18n/{zh.toml => zh-CN.toml} | 0 layouts/partials/header.html | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) rename exampleSite/content/{about.zh.md => about.zh-cn.md} (100%) rename exampleSite/content/posts/{Basic-Markdown-Preview.zh.md => Basic-Markdown-Preview.zh-cn.md} (100%) rename exampleSite/content/posts/{test-mermaid.zh.md => test-mermaid.zh-cn.md} (100%) rename exampleSite/content/posts/{test.zh.md => test.zh-cn.md} (100%) rename exampleSite/content/posts/{documentation.zh.md => theme-documentation-basics.zh-cn.md} (100%) rename i18n/{zh.toml => zh-CN.toml} (100%) diff --git a/assets/css/style.template.scss b/assets/css/style.template.scss index da22c6533..c9799fdb4 100644 --- a/assets/css/style.template.scss +++ b/assets/css/style.template.scss @@ -1,7 +1,7 @@ @charset 'utf-8'; $home-profile: {{ if .Site.Params.home.profile.enable }}true{{ else }}false{{ end }}; -$home-posts: {{ if .Site.Params.home.posts.enable }}true{{ else }}false{{ end }}; +$home-posts: {{ if ne .Site.Params.home.posts.enable false }}true{{ else }}false{{ end }}; $header-normal-mode-desktop: {{ if eq .Site.Params.header.desktopMode "normal" }}true{{ else }}false{{ end }}; $header-normal-mode-mobile: {{ if eq .Site.Params.header.mobileMode "normal" }}true{{ else }}false{{ end }}; diff --git a/exampleSite/config.toml b/exampleSite/config.toml index f9b756805..6ffb34e3e 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -1,6 +1,6 @@ baseURL = "/" -# [en, zh, ...] determines default content language -# [en, zh, ...] 设置默认的语言 +# [en, zh-CN, ...] determines default content language +# [en, zh-CN, ...] 设置默认的语言 defaultContentLanguage = "en" # theme # 主题 @@ -28,7 +28,7 @@ enableEmoji = true title = "LoveIt Theme" # language name languageName = "English" - # whether to include chinese/japanese/korean + # whether to include Chinese/Japanese/Korean hasCJKLanguage = false # default amount of posts in each pages paginate = 12 @@ -219,10 +219,10 @@ enableEmoji = true appId = "" languageCode = "en_US" - [languages.zh] + [languages.zh-CN] weight = 2 # 网站语言 - languageCode = "zh" + languageCode = "zh-CN" # 网站标题 title = "LoveIt 主题" # 语言名称 @@ -238,28 +238,28 @@ enableEmoji = true # 日期格式 dateFormatToUse = "2006-01-02" # 菜单信息 - [languages.zh.menu] - [[languages.zh.menu.main]] + [languages.zh-CN.menu] + [[languages.zh-CN.menu.main]] identifier = "posts" name = "文章" url = "/posts/" weight = 1 - [[languages.zh.menu.main]] + [[languages.zh-CN.menu.main]] identifier = "tags" name = "标签" url = "/tags/" weight = 2 - [[languages.zh.menu.main]] + [[languages.zh-CN.menu.main]] identifier = "categories" name = "分类" url = "/categories/" weight = 3 - [[languages.zh.menu.main]] + [[languages.zh-CN.menu.main]] identifier = "about" name = "关于" url = "/about/" weight = 4 - [languages.zh.params] + [languages.zh-CN.params] # 网站描述 description = "关于 LoveIt 主题" # 网站关键词 @@ -267,9 +267,9 @@ enableEmoji = true # 网站默认主题 ("light", "dark", "auto") defaultTheme = "auto" # 主页信息设置 - [languages.zh.params.home] + [languages.zh-CN.params.home] # 主页个人信息 - [languages.zh.params.home.profile] + [languages.zh-CN.params.home.profile] enable = true # Gravatar 邮箱，用于优先在主页显示的头像 gravatarEmail = "" @@ -282,14 +282,14 @@ enableEmoji = true # 是否显示社交账号 social = true # 主页文章列表 - [languages.zh.params.home.posts] + [languages.zh-CN.params.home.posts] enable = true # 主页每页显示文章数量 paginate = 6 # 当你没有在文章前面设置 "hiddenFromHomePage" 时的默认行为 defaultHiddenFromHomePage = false # 主页的社交信息设置 - [languages.zh.params.social] + [languages.zh-CN.params.social] GitHub = "xxxx" # Linkedin = "xxxx" Twitter = "xxxx" @@ -355,7 +355,7 @@ enableEmoji = true # Matrix = "xxxx" Bilibili = "xxxx" # 文章页面的分享信息设置 - [languages.zh.params.share] + [languages.zh-CN.params.share] enable = true Twitter = true Facebook = true @@ -385,20 +385,20 @@ enableEmoji = true # Trello = true # Mix = true # 评论系统设置 - [languages.zh.params.comment] + [languages.zh-CN.params.comment] enable = true # Disqus 评论系统设置 (https://disqus.com/) - [languages.zh.params.comment.disqus] + [languages.zh-CN.params.comment.disqus] # Disqus 的用户名，用来在文章中启用 Disqus 评论系统 shortname = "dillonzq" # Gittalk 评论系统设置 (https://github.com/gitalk/gitalk) - [languages.zh.params.comment.gitalk] + [languages.zh-CN.params.comment.gitalk] owner = "" repo = "" clientId = "" clientSecret = "" # Valine 评论系统设置 (https://github.com/xCss/Valine) - [languages.zh.params.comment.valine] + [languages.zh-CN.params.comment.valine] enable = false appId = "" appKey = "" @@ -411,7 +411,7 @@ enableEmoji = true visitor = true recordIP = true # Facebook 评论系统设置 (https://developers.facebook.com/docs/plugins/comments) - [languages.zh.params.comment.facebook] + [languages.zh-CN.params.comment.facebook] enable = false width = "100%" numPosts = 10 diff --git a/exampleSite/content/about.zh.md b/exampleSite/content/about.zh-cn.md similarity index 100% rename from exampleSite/content/about.zh.md rename to exampleSite/content/about.zh-cn.md diff --git a/exampleSite/content/posts/Basic-Markdown-Preview.zh.md b/exampleSite/content/posts/Basic-Markdown-Preview.zh-cn.md similarity index 100% rename from exampleSite/content/posts/Basic-Markdown-Preview.zh.md rename to exampleSite/content/posts/Basic-Markdown-Preview.zh-cn.md diff --git a/exampleSite/content/posts/test-mermaid.zh.md b/exampleSite/content/posts/test-mermaid.zh-cn.md similarity index 100% rename from exampleSite/content/posts/test-mermaid.zh.md rename to exampleSite/content/posts/test-mermaid.zh-cn.md diff --git a/exampleSite/content/posts/test.zh.md b/exampleSite/content/posts/test.zh-cn.md similarity index 100% rename from exampleSite/content/posts/test.zh.md rename to exampleSite/content/posts/test.zh-cn.md diff --git a/exampleSite/content/posts/documentation.zh.md b/exampleSite/content/posts/theme-documentation-basics.zh-cn.md similarity index 100% rename from exampleSite/content/posts/documentation.zh.md rename to exampleSite/content/posts/theme-documentation-basics.zh-cn.md diff --git a/i18n/zh.toml b/i18n/zh-CN.toml similarity index 100% rename from i18n/zh.toml rename to i18n/zh-CN.toml diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 54d669b81..e938b672a 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -63,7 +63,7 @@