Merge branch 'release/3.2.13'

This commit is contained in:
Michael Rose 2016-07-01 12:58:52 -04:00
commit 4dca159fbf
5 changed files with 18 additions and 16 deletions

View file

@ -1,3 +1,10 @@
## [3.2.13](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.13)
### Enhancement
- Add English default UI text for Canada, Great Britain, and Australia. [#377](https://github.com/mmistakes/minimal-mistakes/issues/377)
- Switch default locale from `en-US` to `en`.
## [3.2.12](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.12)
### Enhancements

View file

@ -6,7 +6,7 @@
# `jekyll serve`. If you change this file, please restart the server process.
# Site Settings
locale : "en-US"
locale : "en"
title : "Site Title"
title_separator : "-"
name : "Your Name"

View file

@ -1,16 +1,7 @@
# main links links
main:
- title: "Quick-Start Guide"
url: https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/
- title: "Sample Navigation Link"
url: https://mmistakes.github.io/minimal-mistakes/docs/navigation/
- title: "About"
url: https://mmistakes.github.io/minimal-mistakes/
- title: "Sample Posts"
url: https://mmistakes.github.io/minimal-mistakes/year-archive/
- title: "Sample Pages"
url: https://mmistakes.github.io/minimal-mistakes/page-archive/
- title: "Sample Collections"
url: https://mmistakes.github.io/minimal-mistakes/collection-archive/
- title: "Sample Navigation Link 2"
url: /

View file

@ -29,7 +29,11 @@ en: &DEFAULT_EN
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
en-US:
<<: *DEFAULT_EN
en-UK:
en-CA:
<<: *DEFAULT_EN
en-GB:
<<: *DEFAULT_EN
en-AU:
<<: *DEFAULT_EN
# Spanish

View file

@ -1,6 +1,6 @@
{
"name": "minimal-mistakes",
"version": "3.2.12",
"version": "3.2.13",
"description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": {
"type": "git",