docs: update, resolve kitian616#134

kevvor · Jan 10, 2019 · d268a69 · d268a69
1 parent 9abb5af
commit d268a69
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 18 deletions.
diff --git a/_data/locale.yml b/_data/locale.yml
@@ -18,12 +18,12 @@ en: &EN
   EMAIL_ME                : "Send me Email."
   COPYRIGHT_DATES         : "2019"
 
+en-GB:
+  <<: *EN
 en-US:
   <<: *EN
 en-CA:
   <<: *EN
-en-GB:
-  <<: *EN
 en-AU:
   <<: *EN
 

diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -1,9 +1,9 @@
 header:
   - titles:
       en      : &EN       Archive
+      en-GB   : *EN
       en-US   : *EN
       en-CA   : *EN
-      en-GB   : *EN
       en-AU   : *EN
       zh-Hans : &ZH_HANS  归档
       zh      : *ZH_HANS
@@ -18,9 +18,9 @@ header:
 
   - titles:
       en      : &EN       About
+      en-GB   : *EN
       en-US   : *EN
       en-CA   : *EN
-      en-GB   : *EN
       en-AU   : *EN
       zh-Hans : &ZH_HANS  关于
       zh      : *ZH_HANS

diff --git a/_layouts/archive.html b/_layouts/archive.html
@@ -2,9 +2,9 @@
 layout: page
 titles:
   en      : &EN       Archive
+  en-GB   : *EN
   en-US   : *EN
   en-CA   : *EN
-  en-GB   : *EN
   en-AU   : *EN
   zh-Hans : &ZH_HANS  归档
   zh      : *ZH_HANS

diff --git a/_layouts/home.html b/_layouts/home.html
@@ -2,9 +2,9 @@
 layout: articles
 titles:
   en      : &EN       Home
+  en-GB   : *EN
   en-US   : *EN
   en-CA   : *EN
-  en-GB   : *EN
   en-AU   : *EN
   zh-Hans : &ZH_HANS  主页
   zh      : *ZH_HANS

diff --git a/about.md b/about.md
@@ -2,9 +2,9 @@
 layout: article
 titles:
   en      : &EN       About
+  en-GB   : *EN
   en-US   : *EN
   en-CA   : *EN
-  en-GB   : *EN
   en-AU   : *EN
   zh-Hans : &ZH_HANS  关于
   zh      : *ZH_HANS

diff --git a/docs/_config.dev.yml b/docs/_config.dev.yml
@@ -160,7 +160,7 @@ search:
 
   ## Google Custom Search Engine
   google:
-    # custom_search_engine_id: 017643444788069204610 # Google Custom Search Engine ID
+    # custom_search_engine_id: 017643444788069204610:4gvhea_mvga # Google Custom Search Engine ID
 
 
 ## => Analytics

diff --git a/docs/_data/locale.yml b/docs/_data/locale.yml
@@ -18,12 +18,12 @@ en: &EN
   EMAIL_ME                : "Send me Email."
   COPYRIGHT_DATES         : "2019"
 
+en-GB:
+  <<: *EN
 en-US:
   <<: *EN
 en-CA:
   <<: *EN
-en-GB:
-  <<: *EN
 en-AU:
   <<: *EN
 

diff --git a/docs/_docs/en/1.1-quick-start.md b/docs/_docs/en/1.1-quick-start.md
@@ -22,6 +22,10 @@ To install it with common method, all you need to do is copying all the theme fi
    $ git clone [email protected]:kitian616/jekyll-TeXt-theme.git
    ```
 
+   ```bash
+   $ git clone https://github.com/kitian616/jekyll-TeXt-theme.git
+   ```
+
 1. Download and unzip the file to your Jekyll site directory.
 
    <a class="button button--success button--rounded" href="https://github.com/kitian616/jekyll-TeXt-theme/archive/master.zip"><i class="fas fa-download"></i> Download TeXt Theme</a>

diff --git a/docs/_docs/en/2.7-i18n.md b/docs/_docs/en/2.7-i18n.md
@@ -14,7 +14,7 @@ The translation keys and multi-language names mentioned above support the follow
 
 | Language                | `lang` |
 | ---                     | ---    |
-| **English**             | en, en-US, en-CA, enGB, en-AU |
+| **English**             | en, en-GB, en-US, en-CA, en-AU |
 | **Simplified Chinese**  | zh-Hans, zh, zh-CN, zh-SG |
 | **Traditional Chinese** | zh-Hant, zh-TW, zh-HK |
 | **Korean**              | ko, ko-KR |

diff --git a/docs/_docs/zh/1.1-quick-start.md b/docs/_docs/zh/1.1-quick-start.md
@@ -22,6 +22,10 @@ TeXt 是一款 100% 兼容 GitHub Pages 的 Jekyll 主题，你可以通过 Fork
    $ git clone [email protected]:kitian616/jekyll-TeXt-theme.git
    ```
 
+   ```bash
+   $ git clone https://github.com/kitian616/jekyll-TeXt-theme.git
+   ```
+
 1. 下载主题压缩包并解压到你的项目目录中：
 
    <a class="button button--success button--rounded" href="https://github.com/kitian616/jekyll-TeXt-theme/archive/master.zip"><i class="fas fa-download"></i> 下载 TeXt 主题</a>

diff --git a/docs/_docs/zh/2.7-i18n.md b/docs/_docs/zh/2.7-i18n.md
@@ -14,7 +14,7 @@ TeXt 把 UI 元素的文字整理成一系列的翻译标识统一的放置在 *
 
 | 语言     | `lang` |
 | ---     | ---    |
-| **英语** | en, en-US, en-CA, enGB, en-AU |
+| **英语** | en, en-GB, en-US, en-CA, en-AU |
 | **简体中文**  | zh-Hans, zh, zh-CN, zh-SG |
 | **繁体中文**  | zh-Hant, zh-TW, zh-HK |
 | **韩语** | ko, ko-KR |

diff --git a/docs/_languages/1-english.md b/docs/_languages/1-english.md
@@ -14,8 +14,8 @@ English.
 
 ```yml
 lang: en
+lang: en-GB
 lang: en-US
 lang: en-CA
-lang: en-GB
 lang: en-AU
 ```
diff --git a/test/_data/locale.yml b/test/_data/locale.yml
@@ -18,12 +18,12 @@ en: &EN
   EMAIL_ME                : "Send me Email."
   COPYRIGHT_DATES         : "2019"
 
+en-GB:
+  <<: *EN
 en-US:
   <<: *EN
 en-CA:
   <<: *EN
-en-GB:
-  <<: *EN
 en-AU:
   <<: *EN
 

diff --git a/test/_data/navigation.yml b/test/_data/navigation.yml
@@ -1,9 +1,9 @@
 header:
   - titles:
       en      : &EN       Archive
+      en-GB   : *EN
       en-US   : *EN
       en-CA   : *EN
-      en-GB   : *EN
       en-AU   : *EN
       zh-Hans : &ZH_HANS  归档
       zh      : *ZH_HANS
@@ -18,9 +18,9 @@ header:
 
   - titles:
       en      : &EN       About
+      en-GB   : *EN
       en-US   : *EN
       en-CA   : *EN
-      en-GB   : *EN
       en-AU   : *EN
       zh-Hans : &ZH_HANS  关于
       zh      : *ZH_HANS

diff --git a/test/about.md b/test/about.md
@@ -2,9 +2,9 @@
 layout: article
 titles:
   en      : &EN       About
+  en-GB   : *EN
   en-US   : *EN
   en-CA   : *EN
-  en-GB   : *EN
   en-AU   : *EN
   zh-Hans : &ZH_HANS  关于
   zh      : *ZH_HANS
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,12 +18,12 @@ en: &EN @@
       EMAIL_ME                : "Send me Email."
       COPYRIGHT_DATES         : "2019"
+    en-GB:
+      <<: *EN
     en-US:
       <<: *EN
     en-CA:
       <<: *EN
-    en-GB:
-      <<: *EN
     en-AU:
       <<: *EN
@@ Expand Down @@