blog

commit 19f454c214cb2000148eb3a05cd00ef5d04557db
parent d5adb265d7dd01e4abf2f40e38819922bfdf43d5
Author: Shimmy Xu <shimmy.xu@shimmy1996.com>
Date:   Fri, 25 May 2018 23:54:23 -0500

Move copyright text and taxonomy parsing from i18n into config.toml.

Diffstat:
M
config.toml
 | 
40
++++++++++++++++++++++------------------
M
i18n/en.toml
 | 
9
---------
M
i18n/zh.toml
 | 
9
---------

3 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/config.toml b/config.toml
@@ -1,35 +1,34 @@
 # Site Settings
 baseURL                        = "shimmy1996.com"
-title                          = "Library of Trantor"
 theme                          = "soresu"
-footnotereturnlinkcontents     = "↩"
-DefaultContentLanguage         = "en"
-DefaultContentLanguageInSubdir = true
+footnoteReturnLinkContents     = "↩"
+defaultContentLanguage         = "en"
+defaultContentLanguageInSubdir = true
+preserveTaxonomyNames          = true
 
 # Pygments Settings
 pygmentsCodefences             = true
 pygmentsCodefencesGuessSyntax  = false
 pygmentsStyle                  = "emacs"
 pygmentsOptions                = "linenos="
-preserveTaxonomyNames          = true
-
-[permalinks]
-posts      = "/posts/:year-:month-:day-:slug/"
 
-[author]
-name       = "Shimmy Xu"
-github     = "shimmy1996"
+[Permalinks]
+posts    = "/posts/:year-:month-:day-:slug/"
 
 [Taxonomies]
-tag        = "tags"
-categories = "categories"
+category = "categories"
+tag      = "tags"
 
 [Languages]
-
   [Languages.en]
-  title        = "Library of Trantor"
+  languageName = "EN"
+  copyright    = "© [Shimmy Xu](/en/contact/) 2017-2018 | [Github](https://github.com/shimmy1996) | [Keybase](https://keybase.io/shimmy1996) | [Mastodon](https://mstdn.shimmy1996.com/@shimmy1996) | [Subscribe](/en/index.xml)"
   subtitle     = "The Plan is going on."
-  LanguageName = "EN"
+  title        = "Library of Trantor"
+
+    [Languages.en.taxonomy]
+    categories = "Categories"
+    tags       = "Tags"
 
     [[Languages.en.menu.main]]
     name   = "Home"
@@ -53,9 +52,14 @@ categories = "categories"
     weight = 5
 
   [Languages.zh]
-  title        = "川陀大学图书室"
+  languageName = "中文"
+  copyright    = "© [Shimmy Xu](/zh/contact/) 2017-2018 | [Github](https://github.com/shimmy1996) | [Keybase](https://keybase.io/shimmy1996) | [Mastodon](https://mstdn.shimmy1996.com/@shimmy1996) | [订阅](/zh/index.xml)"
   subtitle     = "计划进行中。"
-  LanguageName = "中文"
+  title        = "川陀大学图书室"
+
+    [Languages.zh.taxonomy]
+    categories = "分类"
+    tags       = "标签"
 
     [[Languages.zh.menu.main]]
     name   = "主页"
diff --git a/i18n/en.toml b/i18n/en.toml
@@ -1,15 +1,6 @@
-[footer]
-other = "© [Shimmy Xu](/en/contact/) 2017-2018 | [Github](https://github.com/shimmy1996) | [Keybase](https://keybase.io/shimmy1996) | [Mastodon](https://mstdn.shimmy1996.com/@shimmy1996) | [Subscribe](/en/index.xml)"
-
 [posts]
 other = "Posts"
 
-[tags]
-other = "Tags"
-
-[categories]
-other = "Categories"
-
 # Translation for categories
 [geekery]
 other = "Geekery"
diff --git a/i18n/zh.toml b/i18n/zh.toml
@@ -1,15 +1,6 @@
-[footer]
-other = "© [Shimmy Xu](/zh/contact/) 2017-2018 | [Github](https://github.com/shimmy1996) | [Keybase](https://keybase.io/shimmy1996) | [Mastodon](https://mstdn.shimmy1996.com/@shimmy1996) | [订阅](/zh/index.xml)"
-
 [posts]
 other = "归档"
 
-[tags]
-other = "标签"
-
-[categories]
-other = "分类"
-
 # Translation for categories
 [geekery]
 other = "折腾"