From e536f049ce4c59dbb1e8b8d32594aaac7dee5502 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 27 Jun 2016 10:14:51 -0400 Subject: [PATCH 1/4] Add English default UI text for Canada, Great Britain, and Australia - Close #377 --- _data/ui-text.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 43c2c835..132900b0 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -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 From ac8e41906215dae545d2bc480747b5eb0209aafe Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 27 Jun 2016 10:22:37 -0400 Subject: [PATCH 2/4] Change navigation links to sample data --- _data/navigation.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index fee066fc..ebc12e81 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -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/ \ No newline at end of file + - title: "Sample Navigation Link 2" + url: / \ No newline at end of file From 4ea28fa4e66ad4941a7e78d8d307948f5bae270c Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 27 Jun 2016 11:02:44 -0400 Subject: [PATCH 3/4] Default locale to `en` --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 01346491..57130baa 100644 --- a/_config.yml +++ b/_config.yml @@ -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" From a4bd227927b14ab9594766840cb823880298537f Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Fri, 1 Jul 2016 12:58:36 -0400 Subject: [PATCH 4/4] Update CHANGELOG and bump version to 3.2.13 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d3334c2..4a314575 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/package.json b/package.json index 27a0b5ac..41675fec 100644 --- a/package.json +++ b/package.json @@ -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",