From 46ad2cf4d4dd6e5c6da7b133194b36b6c67916e5 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 23 Jan 2018 19:57:44 -0500 Subject: [PATCH 1/7] Remove ignore file --- .prettierignore | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index a455b7f6..00000000 --- a/.prettierignore +++ /dev/null @@ -1,4 +0,0 @@ -_reset.scss -*.md -Gemfile.lock -package.json \ No newline at end of file From 63e2226054188a5b05a7fe41901eba838a4b5caf Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Fri, 26 Jan 2018 08:26:07 -0500 Subject: [PATCH 2/7] Update stale.yml --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 3aa2e79c..2d8120fa 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -6,6 +6,7 @@ daysUntilClose: 7 exemptLabels: - "Status: Accepted" - "Status: Under Consideration" + - "Status: Review Needed" # Label to use when marking an issue as stale staleLabel: "Status: Stale" # Comment to post when marking an issue as stale. Set to `false` to disable From 1c0f19158d78ab7aa58c3d5172dee1c57ce18570 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 29 Jan 2018 20:38:47 -0500 Subject: [PATCH 3/7] Replace `|` with HTML entity when used as title separator ref: #760, #1506 --- CHANGELOG.md | 1 + _includes/seo.html | 8 ++++++-- docs/_docs/18-history.md | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf36e33..15251479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ * Remove misleading underline hover state on feature row items. * Properly escape quotes in `site.social.name` and `site.name`. [#1485](https://github.com/mmistakes/minimal-mistakes/pull/1485) * Fix typo in upgrading documentation. [#1487](https://github.com/mmistakes/minimal-mistakes/pull/1487) +* Replace `|` with HTML entity when used as title separator. [#760](https://github.com/mmistakes/minimal-mistakes/issues/760) ## [4.9.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.9.0) diff --git a/_includes/seo.html b/_includes/seo.html index fa2be862..2ac0b649 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -4,8 +4,12 @@ {%- endif -%} {%- assign seo_url = seo_url | default: site.github.url -%} +{% if site.title_separator %} + {% assign title_separator = site.title_separator | default: '-' | replace: '|', '|' %} +{% endif %} + {%- if page.title -%} - {%- assign seo_title = page.title | append: " " | append: site.title_separator | append: " " | append: site.title -%} + {%- assign seo_title = page.title | append: " " | append: title_separator | append: " " | append: site.title -%} {%- endif -%} {%- if seo_title -%} @@ -50,7 +54,7 @@ {%- assign og_type = "website" -%} {%- endif -%} -{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ site.title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %} +{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %} {% if author.name %} diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index 39ef7552..c38d57ae 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,7 +4,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2018-01-18T10:26:34-05:00 +last_modified_at: 2018-01-29T20:38:03-05:00 toc: true --- @@ -32,6 +32,7 @@ toc: true * Remove misleading underline hover state on feature row items. * Properly escape quotes in `site.social.name` and `site.name`. [#1485](https://github.com/mmistakes/minimal-mistakes/pull/1485) * Fix typo in upgrading documentation. [#1487](https://github.com/mmistakes/minimal-mistakes/pull/1487) +* Replace `|` with HTML entity when used as title separator. [#760](https://github.com/mmistakes/minimal-mistakes/issues/760) ## [4.9.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.9.0) From 3598e8ebf271bba4594a462671556a347c549f97 Mon Sep 17 00:00:00 2001 From: Andrea <14820600+floatingpurr@users.noreply.github.com> Date: Wed, 31 Jan 2018 02:28:44 +0100 Subject: [PATCH 4/7] Fix docs. Change Isaac Newton with Albert Einstein (#1508) --- docs/_pages/archive-layout-with-content.md | 2 +- docs/_posts/2013-01-11-markup-html-tags-and-formatting.md | 2 +- test/_pages/archive-layout-with-content.md | 2 +- test/_posts/2013-01-11-markup-html-tags-and-formatting.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_pages/archive-layout-with-content.md b/docs/_pages/archive-layout-with-content.md index 6c9b7376..6820122e 100644 --- a/docs/_pages/archive-layout-with-content.md +++ b/docs/_pages/archive-layout-with-content.md @@ -207,7 +207,7 @@ Getting our science styling on with H2O, which should push the "2" do ### Superscript Tag -Still sticking with science and Isaac Newton's E = MC2, which should lift the 2 up. +Still sticking with science and Albert Einstein's E = MC2, which should lift the 2 up. ### Variable Tag diff --git a/docs/_posts/2013-01-11-markup-html-tags-and-formatting.md b/docs/_posts/2013-01-11-markup-html-tags-and-formatting.md index 60fd5618..f7d9437a 100644 --- a/docs/_posts/2013-01-11-markup-html-tags-and-formatting.md +++ b/docs/_posts/2013-01-11-markup-html-tags-and-formatting.md @@ -242,7 +242,7 @@ Getting our science styling on with H2O, which should push the "2" do ### Superscript Tag -Still sticking with science and Isaac Newton's E = MC2, which should lift the 2 up. +Still sticking with science and Albert Einstein's E = MC2, which should lift the 2 up. ### Variable Tag diff --git a/test/_pages/archive-layout-with-content.md b/test/_pages/archive-layout-with-content.md index c99ca8ef..4b6c010f 100644 --- a/test/_pages/archive-layout-with-content.md +++ b/test/_pages/archive-layout-with-content.md @@ -207,7 +207,7 @@ Getting our science styling on with H2O, which should push the "2" do ### Superscript Tag -Still sticking with science and Isaac Newton's E = MC2, which should lift the 2 up. +Still sticking with science and Albert Einstein's E = MC2, which should lift the 2 up. ### Variable Tag diff --git a/test/_posts/2013-01-11-markup-html-tags-and-formatting.md b/test/_posts/2013-01-11-markup-html-tags-and-formatting.md index 60fd5618..f7d9437a 100644 --- a/test/_posts/2013-01-11-markup-html-tags-and-formatting.md +++ b/test/_posts/2013-01-11-markup-html-tags-and-formatting.md @@ -242,7 +242,7 @@ Getting our science styling on with H2O, which should push the "2" do ### Superscript Tag -Still sticking with science and Isaac Newton's E = MC2, which should lift the 2 up. +Still sticking with science and Albert Einstein's E = MC2, which should lift the 2 up. ### Variable Tag From f711708abea85ca86ad73862b3f16a03d0d06dfc Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 1 Feb 2018 13:30:19 +0100 Subject: [PATCH 5/7] Rectify German UI text (#1511) --- _data/ui-text.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index b3f94c7f..c2893522 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -403,9 +403,9 @@ de: &DEFAULT_DE page : "Seite" pagination_previous : "Vorherige" pagination_next : "Nächste" - breadcrumb_home_label : "Home" + breadcrumb_home_label : "Start" breadcrumb_separator : "/" - menu_label : + menu_label : "Menü ein-/ausschalten" toc_label : "Auf dieser Seite" ext_link_label : "Direkter Link" less_than : "weniger als" @@ -415,13 +415,13 @@ de: &DEFAULT_DE tags_label : "Tags:" categories_label : "Kategorien:" date_label : "Aktualisiert:" - comments_label : "Hinterlassen sie einen Kommentar" + comments_label : "Hinterlassen Sie einen Kommentar" comments_title : "Kommentare" more_label : "Mehr anzeigen" related_label : "Ihnen gefällt vielleicht auch" follow_label : "Folgen:" feed_label : "Feed" - powered_by : "Powered by" + powered_by : "Möglich durch" website_label : "Webseite" email_label : "E-Mail" recent_posts : "Aktuelle Beiträge" @@ -430,12 +430,12 @@ de: &DEFAULT_DE comment_form_comment_label : "Kommentar" comment_form_md_info : "Markdown wird unterstützt." comment_form_name_label : "Name" - comment_form_email_label : "E-Mail Addresse" + comment_form_email_label : "E-Mail-Addresse" comment_form_website_label : "Webseite (optional)" comment_btn_submit : "Kommentar absenden" comment_btn_submitted : "Versendet" - comment_success_msg : "Danke für ihren Kommentar! Er wird auf der Seite angezeigt, nachdem er geprüft wurde." - comment_error_msg : "Entschuldigung, es gab einen Fehler. Bitte füllen sie alle benötigten Felder aus und versuchen sie es erneut." + comment_success_msg : "Danke für Ihren Kommentar! Er wird auf der Seite angezeigt, nachdem er geprüft wurde." + comment_error_msg : "Entschuldigung, es gab einen Fehler. Bitte füllen Sie alle benötigten Felder aus und versuchen Sie es erneut." loading_label : "Lade..." de-DE: <<: *DEFAULT_DE From d98808385f83ebbd562580176213a7b79905947b Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Thu, 1 Feb 2018 21:31:18 +0900 Subject: [PATCH 6/7] Update Font Awesome to latest version (#1513) Update Font Awesome to latest version --- _includes/scripts.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/scripts.html b/_includes/scripts.html index 3c56bbe2..45113e09 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -9,7 +9,7 @@ {% endfor %} {% else %} - + {% endif %} {% if site.search == true or page.layout == "search" %} From 264bc759634d57b16af52c5b62212a2cbee9f0e6 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Feb 2018 07:32:26 -0500 Subject: [PATCH 7/7] Update CHANGELOG and history --- CHANGELOG.md | 2 ++ docs/_docs/18-history.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15251479..6a6f975b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ * Remove `base_path` include from `/test` pages. * Reduce font-size of page meta in list/grid items. * Improve feature row styling when used with `archive` layout. [#1484](https://github.com/mmistakes/minimal-mistakes/issues/1484) +* Improve German translations. [#1511](https://github.com/mmistakes/minimal-mistakes/pull/1511) +* Update Font Awesome to `5.0.6`. [#1513](https://github.com/mmistakes/minimal-mistakes/pull/1513) ### Bug Fixes diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index c38d57ae..632692ef 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,7 +4,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2018-01-29T20:38:03-05:00 +last_modified_at: 2018-02-01T07:32:00-05:00 toc: true --- @@ -23,6 +23,8 @@ toc: true * Remove `base_path` include from `/test` pages. * Reduce font-size of page meta in list/grid items. * Improve feature row styling when used with `archive` layout. [#1484](https://github.com/mmistakes/minimal-mistakes/issues/1484) +* Improve German translations. [#1511](https://github.com/mmistakes/minimal-mistakes/pull/1511) +* Update Font Awesome to `5.0.6`. [#1513](https://github.com/mmistakes/minimal-mistakes/pull/1513) ### Bug Fixes