Skip to content

Commit

Permalink
Merge branch 'release/3.2.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
mmistakes committed Jul 1, 2016
2 parents b8076e1 + a4bd227 commit 4dca159
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 4 additions & 13 deletions _data/navigation.yml
Original file line number Diff line number Diff line change
@@ -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: /
6 changes: 5 additions & 1 deletion _data/ui-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 4dca159

Please sign in to comment.