From 4e44f3c5db705ffba793e7821fe06c3a0cd46465 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 29 Nov 2016 08:44:43 -0500 Subject: [PATCH 1/5] Add Staticman default `path` - Close #683 --- _config.yml | 2 +- docs/_docs/05-configuration.md | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/_config.yml b/_config.yml index 1921a0cb..3bb0c5a5 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,7 @@ staticman: filename : comment-{@timestamp} format : "yml" moderation : true - path : "docs/_data/comments/{options.slug}" + path : "docs/_data/comments/{options.slug}" # "/_data/comments/{options.slug}" (default) requiredFields : ['name', 'email', 'message'] transforms: email : "md5" diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md index 5cc84e45..dd86ab1e 100644 --- a/docs/_docs/05-configuration.md +++ b/docs/_docs/05-configuration.md @@ -2,7 +2,7 @@ title: "Configuration" permalink: /docs/configuration/ excerpt: "Settings for configuring and customizing the theme." -modified: 2016-11-03T10:42:01-04:00 +modified: 2016-11-29T08:44:22-05:00 --- Settings that affect your entire site can be changed in [Jekyll's configuration file](https://jekyllrb.com/docs/configuration/): `_config.yml`, found in the root of your project. If you don't have this file you'll need to copy or create one using the theme's [default `_config.yml`](https://github.com/mmistakes/minimal-mistakes/blob/master/_config.yml) as a base. @@ -206,7 +206,6 @@ comments: server : # meta.discourse.org ``` - ##### Facebook Comments To enable Facebook Comments choose how many comments you'd like visible per post and the color scheme of the widget. @@ -231,7 +230,7 @@ Transform user comments into `_data` files that live inside of your GitHub repos ###### Configure Staticman -Default settings have been provided in `_config.yml`. The important ones to set are `provider: "staticman"` and `branch`. View the [full list of configurations](https://github.com/eduardoboucas/staticman#jekyll-configuration). +Default settings have been provided in `_config.yml`. The important ones to set are `provider: "staticman"`, `branch`, and `path`. View the [full list of configurations](https://github.com/eduardoboucas/staticman#jekyll-configuration). **Branch setting:** This is the branch comment files will be sent to via pull requests. If you host your site on GitHub Pages it will likely be `master` unless your repo is setup as a project --- use `gh-pages` in that case. {: .notice--info} From b0d13869451d8552533af8e84e5f7b275defadcf Mon Sep 17 00:00:00 2001 From: DEL+R Date: Tue, 29 Nov 2016 17:30:44 +0100 Subject: [PATCH 2/5] Slight corrections/improvments with French (#685) - `comment_success_msg` : Just corrected a missing `m` in *commentaire* - `related_label` : Added `aussi` (*as well*) in the end of the sentence to make it more "natural" French -`less_than` : `plus petit que` wasn't right, in this precise context, this form is more about the mathematical character `<`. `moins de` is one of the exact use in this particular case (talking about duration) --- *Less than one minute* == `Moins de 1 minute` - `follow_label` : Using `Contact` in place of `Suivez moi` make it less personal, and so, better suited for most cases (`Suivez moi` is more like `Follow me`) --- _data/ui-text.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 90d232a1..582a48d5 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -105,7 +105,7 @@ fr: &DEFAULT_FR menu_label : toc_label : "Sur cette page" ext_link_label : "Lien direct" - less_than : "plus petit que" + less_than : "moins de" minute_read : "minute de lecture" share_on_label : "Partager sur" meta_label : @@ -115,8 +115,8 @@ fr: &DEFAULT_FR comments_label : "Laisser un commentaire" comments_title : more_label : "Lire plus" - related_label : "Vous pourriez aimer" - follow_label : "Suivez moi" + related_label : "Vous pourriez aimer aussi" + follow_label : "Contact" feed_label : "Flux" powered_by : "Propulsé par" website_label : "Site" @@ -132,7 +132,7 @@ fr: &DEFAULT_FR 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_success_msg : "Merci pour votre commentaire, 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: From 19badee4524de55f798082e0aae58e33b110a261 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Dec 2016 15:43:41 -0500 Subject: [PATCH 3/5] Slight correction/improvements to French --- docs/_data/ui-text.yml | 8 ++++---- test/_data/ui-text.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/_data/ui-text.yml b/docs/_data/ui-text.yml index 90d232a1..582a48d5 100644 --- a/docs/_data/ui-text.yml +++ b/docs/_data/ui-text.yml @@ -105,7 +105,7 @@ fr: &DEFAULT_FR menu_label : toc_label : "Sur cette page" ext_link_label : "Lien direct" - less_than : "plus petit que" + less_than : "moins de" minute_read : "minute de lecture" share_on_label : "Partager sur" meta_label : @@ -115,8 +115,8 @@ fr: &DEFAULT_FR comments_label : "Laisser un commentaire" comments_title : more_label : "Lire plus" - related_label : "Vous pourriez aimer" - follow_label : "Suivez moi" + related_label : "Vous pourriez aimer aussi" + follow_label : "Contact" feed_label : "Flux" powered_by : "Propulsé par" website_label : "Site" @@ -132,7 +132,7 @@ fr: &DEFAULT_FR 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_success_msg : "Merci pour votre commentaire, 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: diff --git a/test/_data/ui-text.yml b/test/_data/ui-text.yml index 90d232a1..582a48d5 100644 --- a/test/_data/ui-text.yml +++ b/test/_data/ui-text.yml @@ -105,7 +105,7 @@ fr: &DEFAULT_FR menu_label : toc_label : "Sur cette page" ext_link_label : "Lien direct" - less_than : "plus petit que" + less_than : "moins de" minute_read : "minute de lecture" share_on_label : "Partager sur" meta_label : @@ -115,8 +115,8 @@ fr: &DEFAULT_FR comments_label : "Laisser un commentaire" comments_title : more_label : "Lire plus" - related_label : "Vous pourriez aimer" - follow_label : "Suivez moi" + related_label : "Vous pourriez aimer aussi" + follow_label : "Contact" feed_label : "Flux" powered_by : "Propulsé par" website_label : "Site" @@ -132,7 +132,7 @@ fr: &DEFAULT_FR 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_success_msg : "Merci pour votre commentaire, 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: From 208299a139d3bf802f31a94a5b6d134f57991574 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Dec 2016 15:44:16 -0500 Subject: [PATCH 4/5] Update CHANGELOG and history --- CHANGELOG.md | 10 ++++++++++ docs/_docs/18-history.md | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f76f355..131c4233 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10) + +### Bug Fixes + +- Add Staticman default `path`. [#683](https://github.com/mmistakes/minimal-mistakes/issues/683) + +### Maintenance + +- Slight correction/improvements to French UI text. [#685](https://github.com/mmistakes/minimal-mistakes/pull/685) + ## [4.0.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9) ### Bug Fixes diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index a6738a38..e6cd23da 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,9 +4,19 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -modified: 2016-11-21T16:04:45-05:00 +modified: 2016-12-01T15:44:03-05:00 --- +## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10) + +### Bug Fixes + +- Add Staticman default `path`. [#683](https://github.com/mmistakes/minimal-mistakes/issues/683) + +### Maintenance + +- Slight correction/improvements to French UI text. [#685](https://github.com/mmistakes/minimal-mistakes/pull/685) + ## [4.0.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9) ### Bug Fixes From 9b65e8e0d7636ab43e5b0061b70e41f34ce41827 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Dec 2016 15:46:07 -0500 Subject: [PATCH 5/5] Bump version to 4.0.10 --- docs/_pages/home.md | 2 +- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_pages/home.md b/docs/_pages/home.md index f1dd3c5d..af38ea1b 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -7,7 +7,7 @@ header: cta_label: " Install Now" cta_url: "/docs/quick-start-guide/" caption: -excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
Latest release v4.0.9

{::nomarkdown} {:/nomarkdown}' +excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
Latest release v4.0.10

{::nomarkdown} {:/nomarkdown}' feature_row: - image_path: /assets/images/mm-customizable-feature.png alt: "customizable" diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index 51c2eaeb..96dcbe7c 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/minimal-mistakes-jekyll.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "minimal-mistakes-jekyll" - spec.version = "4.0.9" + spec.version = "4.0.10" spec.authors = ["Michael Rose"] spec.summary = %q{A flexible two-column Jekyll theme.} diff --git a/package.json b/package.json index 79e89fd7..bae2cd98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "4.0.9", + "version": "4.0.10", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",