Merge tag 'upstream/7.6.0'

Upstream version 7.6.0

1 files changed, 4 insertions, 4 deletions

diff --git a/nikola/data/themes/base-jinja/templates/post_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl
index 0ed40b9..00b6210 100644
--- a/nikola/data/themes/base-jinja/templates/post_header.tmpl
+++ b/nikola/data/themes/base-jinja/templates/post_header.tmpl
@@ -4,12 +4,12 @@
 
 {% macro html_title() %}
 {% if title and not post.meta('hidetitle') %}
-    <h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ title|e }}</a></h1>
+    <h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ post.title()|e }}</a></h1>
 {% endif %}
 {% endmacro %}
 
 {% macro html_translations(post) %}
-    {% if translations|length > 1 %}
+    {% if post.translated_to|length > 1 %}
         <div class="metadata posttranslations translations">
             <h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3>
             {% for langname in translations.keys() %}
@@ -32,13 +32,13 @@
         {{ html_title() }}
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p>
-            <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></a></p>
+            <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p>
             {% if not post.meta('nocomments') and site_has_comments %}
                 <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }}
             {% endif %}
             {{ html_sourcelink() }}
             {% if post.meta('link') %}
-                    <p><a href='{{ post.meta('link') }}'>{{ messages("Original site") }}</a></p>
+                    <p class="linkline"><a href='{{ post.meta('link') }}'>{{ messages("Original site") }}</a></p>
             {% endif %}
             {% if post.description() %}
                 <meta name="description" itemprop="description" content="{{ post.description() }}">