From 083ab747e194a726d720b5dd9dd1b21b1dd5cede Mon Sep 17 00:00:00 2001 From: "Sergio C. Orozco Torres" Date: Tue, 7 Jun 2016 01:03:59 -0500 Subject: [PATCH] Fix for division by 0 error caused by null `words_per_minute` --- _data/ui-text.yml | 34 ++++++++++++++++++++++++++++++++++ _includes/read-time.html | 14 +++++++++----- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 2178b7a7..0a36cbda 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -27,10 +27,44 @@ 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: <<: *DEFAULT_EN +# Spanish +# -------------- +es: &DEFAULT_ES + page : "Página" + pagination_previous : "Anterior" + pagination_next : "Siguiente" + breadcrumb_home_label : "Inicio" + breadcrumb_separator : "/" + toc_label : "Contenidos" + ext_link_label : "Enlace" + less_than : "menos de" + minute_read : "minuto de lectura" + minutes_read : "minutos de lectura" + share_on_label : "Compartir" + meta_label : + tags_label : "Etiquetas:" + categories_label : "Categorías:" + date_label : "Actualizado:" + comments_label : "Comentar" + more_label : "Ver más" + related_label : "Podrías ver también" + follow_label : "Seguir:" + feed_label : "Feed" + powered_by : "Powered by" + 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: + <<: *DEFAULT_ES + # Another locale # -------------- \ No newline at end of file diff --git a/_includes/read-time.html b/_includes/read-time.html index 86e7db84..f0f90a28 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -4,10 +4,14 @@ {% 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