N-archive/hacks-guide-minimal-mistakes-theme
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Scot3004/new into hotfix/3.2.6

Browse source
This commit is contained in:
Michael Rose 2016-06-07 11:29:54 -04:00
parent a0082b1e1b 01cfcf0f3b
commit 6bd7f637f3
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
_data/ui-text.yml
View file

@ -27,6 +27,7 @@ en: &DEFAULT_EN
website_label : "Website" website_label : "Website"
email_label : "Email" email_label : "Email"
recent_posts : "Recent Posts" recent_posts : "Recent Posts"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
en-US: en-US:
<<: *DEFAULT_EN <<: *DEFAULT_EN
en-UK: en-UK:
@ -59,6 +60,7 @@ es: &DEFAULT_ES
website_label : "Sitio web" website_label : "Sitio web"
email_label : "Email" email_label : "Email"
recent_posts : "Entradas recientes" recent_posts : "Entradas recientes"
undefined_wpm : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml"
es-ES: es-ES:
<<: *DEFAULT_ES <<: *DEFAULT_ES
es-CO: es-CO:

16
_includes/read-time.html
View file

@ -1,13 +1,19 @@
{% if post.read_time %} {% if post.read_time %}
{% assign words = post.content | strip_html | number_of_words %} {% assign words = post.content | strip_html | number_of_words %}
{% elsif page.read_time %} {% elsif page.read_time %}
{% assign words = page.content | strip_html | number_of_words %} {% assign words = page.content | strip_html | number_of_words %}
{% endif %} {% endif %}
{% if words < 180 %} {% if site.words_per_minute %}
{{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }} {% if words < 180 %}
{% elsif words < 360 %} {{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }}
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 %} {% 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 %} {% endif %}