diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 849b9ac..0f1524b 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -20,19 +20,21 @@
       </h1>
       {{ with .Params.author }}
       <p class="tracked">
-          By <strong>
-          {{ if reflect.IsSlice . }}
+          {{ $.Render "by" }} <strong>
+          {{- if reflect.IsSlice . -}}
               {{ delimit . ", " | markdownify }}
-          {{else}}
+          {{- else -}}
               {{ . | markdownify }}
-          {{ end }}
+          {{- end -}}
           </strong>
       </p>
       {{ end }}
       {{/* Hugo uses Go's date formatting is set by example. Here are two formats */}}
+      {{ if not .Date.IsZero }}
       <time class="f6 mv4 dib tracked" {{ printf `datetime="%s"` (.Date.Format "2006-01-02T15:04:05Z07:00") | safeHTMLAttr }}>
-        {{- .Date.Format "January 2, 2006" -}}
+        {{- .Date | time.Format (default "January 2, 2006" .Site.Params.date_format) -}}
       </time>
+      {{end}}
 
       {{/*
           Show "reading time" and "word count" but only if one of the following are true:
@@ -41,8 +43,8 @@
           3) A page front matter value is set `show_reading_time = true`
         */}}
       {{ if (or (eq (.Param "show_reading_time") true) (eq $section.Params.show_reading_time true) )}}
-        <span class="f6 mv4 dib tracked"> - {{ .ReadingTime}} minutes read</span>
-        <span class="f6 mv4 dib tracked"> - {{ .WordCount}} words</span>
+        <span class="f6 mv4 dib tracked"> - {{ i18n "readingTime" .ReadingTime }} </span>
+        <span class="f6 mv4 dib tracked"> - {{ i18n "wordCount" .WordCount }} </span>
       {{ end }}
         {{ if .Site.Params.commentoEnable }}
         <span class="f6 mv4 tr dib tracked">