3 files changed, 19 insertions, 15 deletions
diff --git a/_includes/date.html b/_includes/date.html
index f12692a..47aa3cb 100644
--- a/_includes/date.html
+++ b/_includes/date.html
@@ -12,29 +12,29 @@
 {% assign month = include.date | date: "%-m" %}
 {% case month %}
 {% when "1" %}
-  {% capture month %}Gener{% endcapture %}
+  {% capture month %}gener{% endcapture %}
 {% when "2" %}
-  {% capture month %}Febrer{% endcapture %}
+  {% capture month %}febrer{% endcapture %}
 {% when "3" %}
-  {% capture month %}Març{% endcapture %}
+  {% capture month %}març{% endcapture %}
 {% when "4" %}
-  {% capture month %}Abril{% endcapture %}
+  {% capture month %}abril{% endcapture %}
 {% when "5" %}
-  {% capture month %}Maig{% endcapture %}
+  {% capture month %}maig{% endcapture %}
 {% when "6" %}
-  {% capture month %}Juny{% endcapture %}
+  {% capture month %}juny{% endcapture %}
 {% when "7" %}
-  {% capture month %}Juliol{% endcapture %}
+  {% capture month %}juliol{% endcapture %}
 {% when "8" %}
-  {% capture month %}Agost{% endcapture %}
+  {% capture month %}agost{% endcapture %}
 {% when "9" %}
-  {% capture month %}Setembre{% endcapture %}
+  {% capture month %}setembre{% endcapture %}
 {% when "10" %}
-  {% capture month %}Octubre{% endcapture %}
+  {% capture month %}octubre{% endcapture %}
 {% when "11" %}
-  {% capture month %}Novembre{% endcapture %}
+  {% capture month %}novembre{% endcapture %}
 {% when "12" %}
-  {% capture month %}Desembre{% endcapture %}
+  {% capture month %}desembre{% endcapture %}
 {% endcase %}
 
 {% assign year = include.date | date: "%Y" %}
diff --git a/_includes/grid.html b/_includes/grid.html
index 26771a9..f36c168 100644
--- a/_includes/grid.html
+++ b/_includes/grid.html
@@ -29,9 +29,9 @@
     </p>
 
     <p id="tag-search-message">
-      Filtering by the tag:
+      {% t tags.filtering_by %}:
       <code id="tag-searched"></code>.
-      Click <a href="{{ page.url | prepend: site.baseurl }}">here</a> to cancel.
+      {% t tags.click %} <a href="{{ page.url | prepend: site.baseurl }}">{% t tags.here %}</a> {% t tags.to_cancel %}.
     </p>
   </div>
 
diff --git a/_includes/postmeta.html b/_includes/postmeta.html
index 0c7416d..d9cc684 100644
--- a/_includes/postmeta.html
+++ b/_includes/postmeta.html
@@ -6,11 +6,15 @@
       {% include date.html date=include.date %}
       {{ pre }}{{ day }} de {{ month }} del {{ year }}
     {% else %}
-      {{ post.date | date: "%B %-d, %Y" }}
+      {{ include.date | date: "%B %-d, %Y" }}
     {% endif %}
 
     {% t footer.by %} {{ site.author }}.
+
+    {% capture tags_count %}{{ include.tags | size }}{% endcapture %}
+    {% if tags_count != "0" %}
     <span>{% t blog.tags %}: </span>
+    {% endif %}
   </div>
   <div class="separator"></div>