From 306d6b40b0e2e3a564d926932146552a5bfecbf4 Mon Sep 17 00:00:00 2001 From: Flohw Date: Tue, 23 Aug 2016 10:00:37 +0200 Subject: [PATCH 1/5] Add french translations --- _data/ui-text.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 9097938b02eb..06444af77a8d 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -120,17 +120,18 @@ fr: &DEFAULT_FR email_label : "Email" recent_posts : "Posts récents" undefined_wpm : "Le paramètre words_per_minute n'est pas défini dans _config.yml" - comment_form_info : - comment_form_comment_label : - comment_form_md_info : - comment_form_name_label : - comment_form_email_label : - comment_form_website_label : - comment_btn_submit : - comment_btn_submitted : - comment_success_msg : - comment_error_msg : - loading_label : + comments_title : "Commentaires" + comment_form_info : "Votre adresse email ne sera pas visible. Les champs obligatoires sont marqués" + comment_form_comment_label : "Commentaire" + comment_form_md_info : "Markdown est supporté." + comment_form_name_label : "Nom" + comment_form_email_label : "Adresse mail" + comment_form_website_label : "Site web (optionnel)" + comment_btn_submit : "Envoyer" + comment_btn_submitted : "Envoyé" + comment_success_msg : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé." + comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez." + loading_label : "Chargement..." fr-FR: <<: *DEFAULT_FR fr-BE: From 16a1a9a5054f2c3d612a1ab39e79c64c3aca8e7b Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 23 Aug 2016 08:53:39 -0400 Subject: [PATCH 2/5] Exclude `vendor` --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index d7bac3f201eb..daaea368fa20 100644 --- a/_config.yml +++ b/_config.yml @@ -114,6 +114,7 @@ include: exclude: - "*.sublime-project" - "*.sublime-workspace" + - vendor - .asset-cache - .bundle - .jekyll-assets-cache From 0d6816e770510177049acc47098a33f9934a9b20 Mon Sep 17 00:00:00 2001 From: Vincent Chu Date: Thu, 25 Aug 2016 12:15:23 -0400 Subject: [PATCH 3/5] Fix Liquid syntax error for offending parentheses Liquid Warning: Liquid syntax error (line 3): Expected dotdot but found id in "(page.header.overlay_color or page.header.overlay_image) or page.header.image" in /_layouts/single.html Liquid Warning: Liquid syntax error (line 1): Expected dotdot but found id in "(page.header.overlay_color or page.header.overlay_image) or page.header.image" in /_layouts/archive.html Liquid Warning: Liquid syntax error (line 3): Expected dotdot but found id in "(page.header.overlay_color or page.header.overlay_image) or page.header.image" in /_layouts/splash.html --- _layouts/archive.html | 2 +- _layouts/single.html | 2 +- _layouts/splash.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/archive.html b/_layouts/archive.html index 22f984c78d80..fe41fba8a600 100644 --- a/_layouts/archive.html +++ b/_layouts/archive.html @@ -2,7 +2,7 @@ layout: default --- -{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %} +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} {% include page__hero.html %} {% endif %} diff --git a/_layouts/single.html b/_layouts/single.html index 3629aa62637a..54a18f0dfd7f 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -4,7 +4,7 @@ {% include base_path %} -{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %} +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} {% include page__hero.html %} {% endif %} diff --git a/_layouts/splash.html b/_layouts/splash.html index 035fa2f23c2b..d17d8fc77957 100644 --- a/_layouts/splash.html +++ b/_layouts/splash.html @@ -4,7 +4,7 @@ {% include base_path %} -{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %} +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} {% include page__hero.html %} {% endif %} From 467e5dc84e4c9797797d52c0d758947578ffc123 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 25 Aug 2016 14:28:51 -0400 Subject: [PATCH 4/5] Update gems: `colorator` (1.1.0), `forwardable-extended` (2.6.0), `github-pages` (93), `jekyll` (= 3.2.1), `minima` (= 1.0.1) --- Gemfile.lock | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a5ea60a20a7..98c22301a97d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorator (0.1) + colorator (1.1.0) ethon (0.9.0) ffi (>= 1.3.0) execjs (2.7.0) @@ -20,11 +20,12 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.9.14) ffi (1.9.14-x64-mingw32) + forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (89) + github-pages (93) activesupport (= 4.2.7) - github-pages-health-check (= 1.1.0) - jekyll (= 3.1.6) + github-pages-health-check (= 1.2.0) + jekyll (= 3.2.1) jekyll-coffeescript (= 1.0.1) jekyll-feed (= 0.5.1) jekyll-gist (= 1.4.0) @@ -40,9 +41,10 @@ GEM liquid (= 3.0.6) listen (= 3.0.6) mercenary (~> 0.3) + minima (= 1.0.1) rouge (= 1.11.1) terminal-table (~> 1.4) - github-pages-health-check (1.1.0) + github-pages-health-check (1.2.0) addressable (~> 2.3) net-dns (~> 0.8) octokit (~> 4.0) @@ -52,13 +54,14 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.1.6) - colorator (~> 0.1) + jekyll (3.2.1) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) liquid (~> 3.0) mercenary (~> 0.3.3) + pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) jekyll-coffeescript (1.0.1) @@ -95,6 +98,7 @@ GEM rb-inotify (>= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) + minima (1.0.1) minitest (5.9.0) multipart-post (2.0.0) net-dns (0.8.0) @@ -106,6 +110,8 @@ GEM pkg-config (~> 1.1.7) octokit (4.3.0) sawyer (~> 0.7.0, >= 0.5.3) + pathutil (0.14.0) + forwardable-extended (~> 2.6) pkg-config (1.1.7) public_suffix (1.5.3) rb-fsevent (0.9.7) From bcae932f8ccd23029b8eab7c193beef01ea0037f Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 25 Aug 2016 14:33:44 -0400 Subject: [PATCH 5/5] Update CHANGELOG.md and bump version to 3.4.4 --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 929bdc186ad3..b8dff6d5429e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +## [3.4.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.4) + +### Enhancements + +- Add French "comments" related localized UI text. [#472](https://github.com/mmistakes/minimal-mistakes/pull/472) + +### Bug Fixes + +- Exclude `vendor` in Jekyll config file. +- Fix Liquid syntax error for offending parenthesis. [#479](https://github.com/mmistakes/minimal-mistakes/issues/479) + +### Maintenance + +- Update gems: `colorator` (1.1.0), `forwardable-extended` (2.6.0), `github-pages` (93), `jekyll` (= 3.2.1), `minima` (= 1.0.1). + ## [3.4.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.3) ### Enhancements diff --git a/package.json b/package.json index 723bba0f845e..6b21c49c980e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "3.4.3", + "version": "3.4.4", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",