Merge branch 'release/4.0.10'

mmistakes · Dec 1, 2016 · 0c9f8cd · 0c9f8cd
2 parents 6dcbafd + 9b65e8e
commit 0c9f8cd
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 20 deletions.
diff --git 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/_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/_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:

diff --git 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/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}

diff --git 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

diff --git a/docs/_pages/home.md b/docs/_pages/home.md
@@ -7,7 +7,7 @@ header:
   cta_label: "<i class='fa fa-download'></i> 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.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9">Latest release v4.0.9</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
+excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10">Latest release v4.0.10</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/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
@@ -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
@@ -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",

diff --git 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: