Update for Zola 0.23.3

1 files changed, 12 insertions, 15 deletions

diff --git a/templates/404.html b/templates/404.html
index 8c42866..70e1f91 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -2,20 +2,17 @@
 {%- set uglyurls = config.extra.uglyurls | default(value=false) -%}
 {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %}
 
-{%- block seo %}
+{%- block seo -%}
   {{ super() }}
-  {%- set title = "404 Page not found" %}
-
-  {%- if config.title %}
-    {%- set title_addition = title_separator ~ config.title %}
-  {%- else %}
-    {%- set title_addition = "" %}
-  {%- endif %}
-
-  {%- set description = config.description %}
-
-  {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_404=true) }}
-{%- endblock seo %}
+  {%- set title = "404 Page not found" -%}
+  {%- if config.title -%}
+    {%- set title_addition = title_separator ~ config.title -%}
+  {%- else -%}
+    {%- set title_addition = "" -%}
+  {%- endif -%}
+  {%- set description = config.description -%}
+  {{<seo config={config}  title={title}  title_addition={title_addition}  description={description or ""}  is_404={true} />}}
+{%- endblock seo -%}
 
 {%- block content %}
     <div>
@@ -29,11 +26,11 @@
         {%- set i18n_404 = load_data(path="i18n/" ~ lcode ~ '.toml', required=false) -%}
         {%- if not i18n_404 -%}{%- set i18n_404 = load_data(path="themes/abridge/i18n/" ~ lcode ~ ".toml", required=false) -%}{%- endif %}
 
-          <p>{{ macros::translate(key="404_not_found", default="404_not_found", i18n=i18n_404) }}{{ macros::translate(key="full_stop", default=".", i18n=i18n_404) }} {% if config.build_search_index %}{{ macros::translate(key="404_try_search", default="Try searching or", i18n=i18n_404) }}{% endif %} <a href="{{ config.base_url }}/{{ lcode }}/{%- if uglyurls %}index.html{%- endif %}">{{ macros::translate(key="404_go_home", default="go to homepage", i18n=i18n_404) }}</a>{{ macros::translate(key="full_stop", default=".", i18n=i18n_404) }}</p>
+          <p>{{<translate key="404_not_found"  default="404_not_found"  i18n={i18n_404} />}}{{<translate key="full_stop"  default="."  i18n={i18n_404} />}} {% if config.build_search_index %}{{<translate key="404_try_search"  default="Try searching or"  i18n={i18n_404} />}}{% endif %} <a href="{{ config.base_url }}/{{ lcode }}/{%- if uglyurls %}index.html{%- endif %}">{{<translate key="404_go_home"  default="go to homepage"  i18n={i18n_404} />}}</a>{{<translate key="full_stop"  default="."  i18n={i18n_404} />}}</p>
         {%- endif -%}
       {%- endfor -%}
       {% if config.default_language != "en" %}
-        <p>{{ macros::translate(key="404_not_found", default="404_not_found", i18n=i18n) }}{{ macros::translate(key="full_stop", default=".", i18n=i18n) }} {% if config.build_search_index %}{{ macros::translate(key="404_try_search", default="Try searching or", i18n=i18n) }}{% endif %} <a href="{{ config.base_url }}/{%- if uglyurls %}index.html{%- endif %}">{{ macros::translate(key="404_go_home", default="go to homepage", i18n=i18n) }}</a>{{ macros::translate(key="full_stop", default=".", i18n=i18n) }}</p>
+        <p>{{<translate key="404_not_found"  default="404_not_found"  i18n={i18n} />}}{{<translate key="full_stop"  default="."  i18n={i18n} />}} {% if config.build_search_index %}{{<translate key="404_try_search"  default="Try searching or"  i18n={i18n} />}}{% endif %} <a href="{{ config.base_url }}/{%- if uglyurls %}index.html{%- endif %}">{{<translate key="404_go_home"  default="go to homepage"  i18n={i18n} />}}</a>{{<translate key="full_stop"  default="."  i18n={i18n} />}}</p>
       {% endif %}
     </div>
 {%- endblock content %}