From 534adff39d0deb53880053ff3d67797bb2c3e6c8 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 21 Jul 2016 08:29:21 -0400 Subject: [PATCH 1/7] Update README to include version, link to CHANGELOG, and creator info. --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 38832f3d..ee330065 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ -# Minimal Mistakes Jekyll Theme +# [Minimal Mistakes Jekyll Theme](https://mmistakes.github.io/minimal-mistakes/) + +[![GitHub release](https://img.shields.io/github/release/mmistakes/minimal-mistakes.svg)](https://github.com/mmistakes/minimal-mistakes/releases) [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/mmistakes/minimal-mistakes/master/LICENSE) Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your personal site, blog, or portfolio on GitHub or self-hosting on your own server. As the name implies --- styling is purposely minimalistic to be enhanced and customized by you :smile:. +See what's new in the [CHANGELOG](CHANGELOG.md). + [![Minimal Mistakes live preview][2]][1] [1]: https://mmistakes.github.io/minimal-mistakes/ @@ -63,6 +67,14 @@ To help me out try to avoid creating pull requests on `master` and instead branc ## Credits +### Creator + +**Michael Rose** + +- +- +- + ### Icons + Demo Images: - [The Noun Project](https://thenounproject.com) -- Garrett Knoll, Arthur Shlain, and [tracy tam](https://thenounproject.com/tracytam) From 70aa1e26e12b8ab776c890a1cc77ec9edbb55692 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 21 Jul 2016 14:36:27 -0400 Subject: [PATCH 2/7] Update gems - activesupport (4.2.7) - ffi (1.9.14) - github-pages (88) - jekyll-redirect-from (0.11.0) - html-pipeline (2.4.2) - jekyll-watch (1.5.0) --- Gemfile.lock | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 01c019f5..533608b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.6) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -18,10 +18,11 @@ GEM execjs (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.13) - ffi (1.9.13-x64-mingw32) + ffi (1.9.14) + ffi (1.9.14-x64-mingw32) gemoji (2.1.0) - github-pages (86) + github-pages (88) + activesupport (= 4.2.7) github-pages-health-check (= 1.1.0) jekyll (= 3.1.6) jekyll-coffeescript (= 1.0.1) @@ -30,7 +31,7 @@ GEM jekyll-github-metadata (= 2.0.2) jekyll-mentions (= 1.1.3) jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.10.0) + jekyll-redirect-from (= 0.11.0) jekyll-sass-converter (= 1.3.0) jekyll-seo-tag (= 2.0.0) jekyll-sitemap (= 0.10.0) @@ -47,8 +48,8 @@ GEM octokit (~> 4.0) public_suffix (~> 1.4) typhoeus (~> 0.7) - html-pipeline (2.4.1) - activesupport (>= 2, < 5) + html-pipeline (2.4.2) + activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) jekyll (3.1.6) @@ -72,14 +73,14 @@ GEM html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.10.0) + jekyll-redirect-from (0.11.0) jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) jekyll-seo-tag (2.0.0) jekyll (~> 3.1) jekyll-sitemap (0.10.0) - jekyll-watch (1.4.0) + jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) jemoji (0.6.2) gemoji (~> 2.0) From 97ef2d2985064b2a08c9d307dde8d45c415e5fc2 Mon Sep 17 00:00:00 2001 From: Ekrem Karaca Date: Sun, 24 Jul 2016 16:23:26 +0300 Subject: [PATCH 3/7] Update ui-text.yml Turkish locale values... --- _data/ui-text.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 132900b0..9b80757d 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -102,5 +102,36 @@ fr-BE: fr-CH: <<: *DEFAULT_FR +# Turkish +# ----------------- +tr: &DEFAULT_TR + page : "Sayfa" + pagination_previous : "Önceki" + pagination_next : "Sonraki" + breadcrumb_home_label : "Ana Sayfa" + breadcrumb_separator : "/" + toc_label : "İçindekiler" + ext_link_label : "Doğrudan Bağlantı" + less_than : "Şu süreden az: " + minute_read : "dakika tahmini okuma süresi" + share_on_label : "Paylaş" + meta_label : + tags_label : "Etiketler:" + categories_label : "Kategoriler:" + date_label : "Güncelleme tarihi:" + comments_label : "Yorum yapın" + more_label : "Daha fazlasını öğrenin" + related_label : "Bunlar ilginizi çekebilir:" + follow_label : "Takip et:" + feed_label : "RSS" + powered_by : "Emeği geçenler: " + website_label : "Web sayfası" + email_label : "E-posta" + recent_posts : "Son yazılar" + undefined_wpm : "_config.yml dosyasında tanımlanmamış words_per_minute parametresi" +tr-TR: + <<: *DEFAULT_TR + + # Another locale # -------------- From 1814d6c1a548bb92ffb3c556a7ea9384df4dd7e2 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 25 Jul 2016 08:22:10 -0400 Subject: [PATCH 4/7] Add localized text supported by the theme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ee330065..fe95ed29 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages) - Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more. - Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), and custom). - Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom). +- UI localized text: English (default), Spanish, French, and Turkish. #### Demo Pages From 5a2d54f64f8da39618274f4c770720c8fc01e5e3 Mon Sep 17 00:00:00 2001 From: Gabor Meszaros Date: Tue, 26 Jul 2016 15:13:38 +0200 Subject: [PATCH 5/7] Add external atom feed URL config possibility --- _config.yml | 2 ++ _includes/footer.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 57130baa..bd2e2f08 100644 --- a/_config.yml +++ b/_config.yml @@ -28,6 +28,8 @@ comments: appid : num_posts : # 5 (default) colorscheme : # "light" (default), "dark" +atom_feed: + path : # blank (default) uses feed.xml # SEO Related google_site_verification : diff --git a/_includes/footer.html b/_includes/footer.html index 466526dd..a0ffe60e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -17,7 +17,7 @@ {% if site.author.bitbucket %}
  • Bitbucket
    • {% endif %} -
  • {{ site.data.ui-text[site.locale].feed_label }}
    • +
  • {{ site.data.ui-text[site.locale].feed_label }}
    • From d238a0de838310e7f282803006ba4eb3f7f18faf Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 26 Jul 2016 15:34:21 -0400 Subject: [PATCH 6/7] Add external feed URL conditional to `` --- _includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/head.html b/_includes/head.html index a28ce9a0..ffcc7416 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -4,7 +4,7 @@ {% include seo.html %} - + From 2cfad13f515c3fe751713e57dcc61c1d67d94cd7 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 26 Jul 2016 15:43:13 -0400 Subject: [PATCH 7/7] Update CHANGELOG and bump version to 3.3.4 - Close #378, close #379 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87d59e76..5fdca2d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [3.3.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.4) + +### Enhancements + +- Add support for configurable feed URL to use a service like FeedBurner instead of linking directly to `feed.xml` in `` and the site footer. [#378](https://github.com/mmistakes/minimal-mistakes/issues/378), [#379](https://github.com/mmistakes/minimal-mistakes/pull/379), [#406](https://github.com/mmistakes/minimal-mistakes/pull/406) +- Add Turkish localized UI text. [#403](https://github.com/mmistakes/minimal-mistakes/pull/403) + +### Maintenance + +- Update gems: `activesupport` (4.2.7), `ffi` (1.9.14), `github-pages` (88), `jekyll-redirect-from` (0.11.0), `jekyll-watch` (1.5.0). + ## [3.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.3) ### Enhancements diff --git a/package.json b/package.json index 5af267ac..5a08f2c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "3.3.3", + "version": "3.3.4", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",