Merge pull request #11 from yizeng/rename-copyright-entry-in-i18n

Rename copyright entry in i18n
yizeng · Sep 24, 2017 · dc115df · dc115df
2 parents e6b9cc9 + fc769d7
commit dc115df
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 25 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gemspec
 #
 # source "https://rubygems.org"
 
-# gem 'jekyll', '= 3.4.5' # locked in to be consistent GitHub Pages.
+# gem 'jekyll', '= 3.5.2' # locked in to be consistent GitHub Pages.
 
 # group :jekyll_plugins do
 #   gem 'jekyll-feed'

diff --git a/README.md b/README.md
@@ -34,26 +34,30 @@ please follow the commands below first:
 
        cd jekyllapp
 
-Then for newly created or existing Jekyll app,
+4. Then follow the instructions below like existing Jekyll app.
+
+Then for existing Jekyll apps,
 
 1. Install Bundler if haven't done so.
 
        gem install bundler
 
-2. Remove Jekyll auto-generated default pages `about.md` and `index.md`.
+1. Remove Jekyll auto-generated default pages `404.html`, `about.md` and `index.md` or any your custom layouts or existing theme files.
+
+1. Remove the existing `Gemfile.lock`.
 
-3. Download the respository [here](https://github.com/yizeng/jekyll-theme-simple-texture/archive/master.zip)
+1. Download the respository [here](https://github.com/yizeng/jekyll-theme-simple-texture/archive/master.zip)
 and locate `starter-kit` folder,
 or download `starter-kit` folder directly [here](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/yizeng/jekyll-theme-simple-texture/tree/master/starter-kit).
 
-4. Put everything in the `starter-kit` in the root directory,
+1. Put everything in the `starter-kit` in the root directory,
 i.e. `jekyllapp` in this example.
 
-5. Run `bundle install` to install dependencies.
+1. Run `bundle install` to install dependencies.
 
-6. Run Jekyll with `bundle exec jekyll serve`
+1. Run Jekyll with `bundle exec jekyll serve`
 
-7. Hack away at <http://localhost:4000>!
+1. Hack away at <http://localhost:4000>!
 
 ### As a fork
 
@@ -74,7 +78,7 @@ i.e. `jekyllapp` in this example.
    ```ruby
    source "https://rubygems.org"
 
-   gem 'jekyll', '= 3.4.5' # locked in to be consistent GitHub Pages.
+   gem 'jekyll', '= 3.5.2' # locked in to be consistent GitHub Pages.
 
    group :jekyll_plugins do
      gem 'jekyll-feed'

diff --git a/_config.yml b/_config.yml
@@ -5,7 +5,7 @@ lang: en # Language code as defined in _data/i18n.yml. en, en-gb, en-us, zh, zh-
 permalink: /blog/:year/:month/:day/:title/
 
 whitelist: [jekyll-feed, jekyll-redirect-from, jekyll-seo-tag, jekyll-sitemap]
-gems:
+plugins:
   - jekyll-feed
   - jekyll-redirect-from
   - jekyll-seo-tag
@@ -51,9 +51,9 @@ home:
   section2: <h2>A gem-based responsive simple texture styled Jekyll theme</h2>
   section3: <div class="social-links"><a class="ico-github btn" href="https://github.com/yizeng/jekyll-theme-simple-texture" title="View on GitHub"></a></div>
 blog:
-  cc_license: # A link to CC License of your choice, e.g. http://creativecommons.org/licenses/by-sa/4.0/.
-  cc_license_image: # An image of your CC License, e.g. /assets/images/theme/cc-by-sa.png
-  footer_content: A gem-based responsive simple texture styled Jekyll theme.
+  cc_license: http://creativecommons.org/licenses/by-sa/4.0/ # A link to CC License of your choice.
+  cc_license_image: /assets/images/theme/cc-by-sa.png # An image of your CC License. 
+  footer_content: A gem-based responsive simple texture styled <a href="http://jekyllrb.com/">Jekyll</a> theme.
 
 disqus:
   shortname:

diff --git a/_data/i18n.yml b/_data/i18n.yml
@@ -4,7 +4,6 @@ en: &en
   back_to_top: 'Back to Top'
   categories: 'Categories'
   close: 'Close'
-  copyright: '<p><small>Theme <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> developed by <a href="http://yizeng.me" target="_blank">Yi Zeng</a>, powered by <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>.</small></p>'
   enter_blog: 'Enter Blog'
   last_updated: 'Last updated'
   menu: 'Menu'
@@ -26,6 +25,7 @@ en: &en
   show_comments: 'Show Comments'
   show_license: 'Show License'
   tags: 'Tags'
+  theme_info: '<p><small>Theme <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> developed by <a href="http://yizeng.me" target="_blank">Yi Zeng</a>, powered by <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>.</small></p>'
   view: 'View'
 en-us:
   <<: *en
@@ -43,7 +43,6 @@ zh: &zh
   back_to_top: '返回顶部'
   categories: '文章分类'
   close: '关闭'
-  copyright: '<p><small>本博客主题 <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> 由 <a href="http://yizeng.me" target="_blank">Yi Zeng</a> 基于 <a href="https://jekyllrb.com/" target="_blank">Jekyll</a> 开发.</small></p>'
   enter_blog: '进入博客'
   last_updated: '最后更新于'
   menu: '菜单'
@@ -66,6 +65,7 @@ zh: &zh
   show_comments: '显示评论'
   show_license: '显示许可证'
   tags: '文章标签'
+  theme_info: '<p><small>本博客主题 <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> 由 <a href="http://yizeng.me" target="_blank">Yi Zeng</a> 基于 <a href="https://jekyllrb.com/" target="_blank">Jekyll</a> 开发.</small></p>'
   view: '查阅'
 zh-cn:
   <<: *zh

diff --git a/_includes/blog/footer.html b/_includes/blog/footer.html
@@ -7,7 +7,7 @@ <h4><a href="{{ site.paths.home | relative_url }}">{{ site.data.i18n[site.lang].
                     {% if site.blog.footer_content %}
                         <p>{{ site.blog.footer_content }}</p>
                     {% endif %}
-                    {{ site.data.i18n[site.lang].copyright }}
+                    {{ site.data.i18n[site.lang].theme_info }}
                 </div>
                 <div class="social-links">
                     {% if site.author.email %}

diff --git a/jekyll-theme-simple-texture.gemspec b/jekyll-theme-simple-texture.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-simple-texture"
-  spec.version       = "0.1.8"
+  spec.version       = "0.2.1"
   spec.authors       = ["Yi Zeng"]
   spec.email         = ["[email protected]"]
 
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
 
-  spec.add_runtime_dependency "jekyll", "= 3.4.5"
+  spec.add_runtime_dependency "jekyll", "= 3.5.2"
   spec.add_runtime_dependency "jekyll-feed", "~> 0.9.2"
   spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.12.1"
   spec.add_runtime_dependency "jekyll-seo-tag", '~> 2.2', '>= 2.2.3'

diff --git a/starter-kit/Gemfile b/starter-kit/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'jekyll', '= 3.4.5' # locked in to be consistent GitHub Pages.
+gem 'jekyll', '= 3.5.2' # locked in to be consistent GitHub Pages.
 gem 'jekyll-theme-simple-texture'
 
 group :jekyll_plugins do

diff --git a/starter-kit/_config.yml b/starter-kit/_config.yml
@@ -6,7 +6,7 @@ permalink: /blog/:year/:month/:day/:title/
 theme: jekyll-theme-simple-texture
 
 whitelist: [jekyll-feed, jekyll-redirect-from, jekyll-seo-tag, jekyll-sitemap]
-gems:
+plugins:
   - jekyll-feed
   - jekyll-redirect-from
   - jekyll-seo-tag
@@ -52,9 +52,9 @@ home:
   section2: <h2>A gem-based responsive simple texture styled Jekyll theme</h2>
   section3: <div class="social-links"><a class="ico-github btn" href="https://github.com/yizeng/jekyll-theme-simple-texture" title="View on GitHub"></a></div>
 blog:
-  cc_license: # A link to CC License of your choice, e.g. http://creativecommons.org/licenses/by-sa/4.0/.
-  cc_license_image: # An image of your CC License, e.g. /assets/images/theme/cc-by-sa.png
-  footer_content: A gem-based responsive simple texture styled Jekyll theme.
+  cc_license: http://creativecommons.org/licenses/by-sa/4.0/ # A link to CC License of your choice.
+  cc_license_image: /assets/images/theme/cc-by-sa.png # An image of your CC License. 
+  footer_content: A gem-based responsive simple texture styled <a href="http://jekyllrb.com/">Jekyll</a> theme.
 
 disqus:
   shortname:

diff --git a/starter-kit/_data/i18n.yml b/starter-kit/_data/i18n.yml
@@ -4,7 +4,6 @@ en: &en
   back_to_top: 'Back to Top'
   categories: 'Categories'
   close: 'Close'
-  copyright: '<p><small>Theme <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> developed by <a href="http://yizeng.me" target="_blank">Yi Zeng</a>, powered by <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>.</small></p>'
   enter_blog: 'Enter Blog'
   last_updated: 'Last updated'
   menu: 'Menu'
@@ -26,6 +25,7 @@ en: &en
   show_comments: 'Show Comments'
   show_license: 'Show License'
   tags: 'Tags'
+  theme_info: '<p><small>Theme <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> developed by <a href="http://yizeng.me" target="_blank">Yi Zeng</a>, powered by <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>.</small></p>'
   view: 'View'
 en-us:
   <<: *en
@@ -43,7 +43,6 @@ zh: &zh
   back_to_top: '返回顶部'
   categories: '文章分类'
   close: '关闭'
-  copyright: '<p><small>本博客主题 <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> 由 <a href="http://yizeng.me" target="_blank">Yi Zeng</a> 基于 <a href="https://jekyllrb.com/" target="_blank">Jekyll</a> 开发.</small></p>'
   enter_blog: '进入博客'
   last_updated: '最后更新于'
   menu: '菜单'
@@ -66,6 +65,7 @@ zh: &zh
   show_comments: '显示评论'
   show_license: '显示许可证'
   tags: '文章标签'
+  theme_info: '<p><small>本博客主题 <a href="https://github.com/yizeng/jekyll-theme-simple-texture" target="_blank">Simple Texture</a> 由 <a href="http://yizeng.me" target="_blank">Yi Zeng</a> 基于 <a href="https://jekyllrb.com/" target="_blank">Jekyll</a> 开发.</small></p>'
   view: '查阅'
 zh-cn:
   <<: *zh