From 01cfcf0f3b6dc26aa67a93e00e8e06205fedf431 Mon Sep 17 00:00:00 2001 From: "Sergio C. Orozco Torres" Date: Tue, 7 Jun 2016 01:03:59 -0500 Subject: [PATCH 1/3] Undefined word_per_minutes parameter division by zero If the parameter words_per_minute at _config.yml is not defined and the template says that must show read_time then will be divide a number by zero, a fix is verify that parameter and show a message when this is empty or zero. already localized for spanish --- _data/ui-text.yml | 2 ++ _includes/read-time.html | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 99daed15..18867f13 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -27,6 +27,7 @@ en: &DEFAULT_EN website_label : "Website" email_label : "Email" recent_posts : "Recent Posts" + undefined_wpm : "Undefined parameter words_per_minute at _config.yml" en-US: <<: *DEFAULT_EN en-UK: @@ -59,6 +60,7 @@ es: &DEFAULT_ES website_label : "Sitio web" email_label : "Email" recent_posts : "Entradas recientes" + undefined_wpm : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml" es-ES: <<: *DEFAULT_ES es-CO: diff --git a/_includes/read-time.html b/_includes/read-time.html index 86e7db84..b0dd0626 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -1,13 +1,19 @@ + + {% if post.read_time %} {% assign words = post.content | strip_html | number_of_words %} {% elsif page.read_time %} {% assign words = page.content | strip_html | number_of_words %} {% endif %} -{% if words < 180 %} - {{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }} -{% elsif words < 360 %} - 1 {{ site.data.ui-text[site.locale].minute_read }} +{% if site.words_per_minute %} + {% if words < 180 %} + {{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }} + {% elsif words < 360 %} + 1 {{ site.data.ui-text[site.locale].minute_read }} + {% else %} + {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }} + {% endif %} {% else %} - {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }} + {{ site.data.ui-text[site.locale].undefined_words_per_minute }} {% endif %} \ No newline at end of file From f509db21773514daf8271a6c37a070f76d837a30 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Jun 2016 11:32:11 -0400 Subject: [PATCH 2/3] Rename `undefined_words_per_minute` variable to match one set in ui-text.yml - Remove extra white-space - Close #317 --- _includes/read-time.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_includes/read-time.html b/_includes/read-time.html index b0dd0626..272bd4e5 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -1,5 +1,3 @@ - - {% if post.read_time %} {% assign words = post.content | strip_html | number_of_words %} {% elsif page.read_time %} @@ -15,5 +13,5 @@ {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }} {% endif %} {% else %} - {{ site.data.ui-text[site.locale].undefined_words_per_minute }} + {{ site.data.ui-text[site.locale].undefined_wpm }} {% endif %} \ No newline at end of file From 469fb467869a4170c66d3c359ca1eeffbd355aec Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Jun 2016 11:34:30 -0400 Subject: [PATCH 3/3] Update CHANGELOG and bump version to 3.2.6 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dc2dd90..580628b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [3.2.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.6) + +### Bug Fixes + +- Fix error `Liquid Exception: divided by 0 in _includes/archive-single.html, included in _layouts/single.html` caused by null `words_per_minute` in `_config.yml`. [#345](https://github.com/mmistakes/minimal-mistakes/pull/345) + ## [3.2.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.5) ### Bug Fixes diff --git a/package.json b/package.json index 6d1b04bc..07c0646e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "3.2.5", + "version": "3.2.6", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",