Got rid of split+join; uniform name calling

george-gca · Jul 21, 2023 · ba187d6 · ba187d6
1 parent cd3fa1e
commit ba187d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,12 +1,7 @@
-{% capture name_components %}
-  {% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}
-  {% if site.translations[site.lang].main.middle_name %}{{ site.translations[site.lang].main.middle_name }}{% endif %}
-  {% if site.translations[site.lang].main.last_name %}{{ site.translations[site.lang].main.last_name }}{% endif %}
-{% endcapture %}
     {% if site.footer_fixed %}
     <footer class="fixed-bottom">
       <div class="container mt-0">
-        &copy; Copyright {{ site.time | date: '%Y' }} {{ name_components | split:' ' | join:' ' }}. {% t main.footer_text %}
+        &copy; Copyright {{ site.time | date: '%Y' }} {% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}. {% t main.footer_text %}
         {%- if site.impressum_path -%}
         <a href="{{ site.url }}{{ site.baseurl }}{{ site.impressum_path }}">Impressum</a>.
         {%- endif -%}
@@ -18,7 +13,7 @@
     {%- else -%}
     <footer class="sticky-bottom mt-5">
       <div class="container">
-        &copy; Copyright {{ site.time | date: '%Y' }} {{ name_components | split:' ' | join:' ' }}. {% t main.footer_text %}
+        &copy; Copyright {{ site.time | date: '%Y' }} {% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}. {% t main.footer_text %}
         {%- if site.impressum_path -%}
         <a href="{{ site.url }}{{ site.baseurl }}{{ site.impressum_path }}">Impressum</a>.
         {%- endif -%}

diff --git a/_includes/metadata.html b/_includes/metadata.html
@@ -12,13 +12,9 @@
     -->
     <meta http-equiv="Permissions-Policy" content="interest-cohort=()" />
 {%- endif %}
-{% capture name_components %}
-  {% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}
-  {% if site.translations[site.lang].main.middle_name %}{{ site.translations[site.lang].main.middle_name }}{% endif %}
-  {% if site.translations[site.lang].main.last_name %}{{ site.translations[site.lang].main.last_name }}{% endif %}
-{% endcapture %}
+
 {%- if site.title == "blank" -%}
-    {%- capture title -%}{{ name_components | split:' ' | join:' ' }}{%- endcapture -%}
+    {%- capture title -%}{% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}{%- endcapture -%}
 {%- else -%}
     {%- capture title -%}{{ site.title }}{%- endcapture -%}
 {%- endif -%}
@@ -71,7 +67,7 @@
         {{ title }}
     {%- endif -%}
     </title>
-    <meta name="author" content="{{ name_components | split:' ' | join:' ' }}" />
+    <meta name="author" content="{% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}" />
     <meta name="description" content="{%- if page.description -%}{{ page.description }}{%- else -%}{{ site.description }}{%- endif -%}" />
 {%- if page.keywords or site.keywords %}
     <meta name="keywords" content="{%- if page.keywords -%}{{ page.keywords }}{%- else -%}{{ site.keywords }}{%- endif -%}" />
@@ -259,7 +255,7 @@
         "author":
         {
           "@type": "Person",
-          "name": "{{ name_components | split:' ' | join:' ' }}"
+          "name": "{% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}"
         },
         "url": "{{ page.url | prepend: site.baseurl | prepend: site.url }}",
         "@type": "{%- if is_blog_post -%}BlogPosting{%- else -%}WebSite{%- endif -%}",
@@ -268,7 +264,7 @@
         {% if sameaslinks != blank -%}
         "sameAs": {{ sameaslinks }},
         {%- endif %}
-        "name": "{{ name_components | split:' ' | join:' ' }}",
+        "name": "{% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}",
         "@context": "https://schema.org"
     }
     </script>

diff --git a/_layouts/about.html b/_layouts/about.html
@@ -7,15 +7,7 @@
         <header class="post-header">
           <h1 class="post-title">
            {%- if site.title == "blank" -%}
-              {% if site.translations[site.lang].main.first_name %}
-                <span class="font-weight-bold">{{ site.translations[site.lang].main.first_name }}</span>
-              {%- endif -%}
-              {% if site.translations[site.lang].main.middle_name %}
-                {{ site.translations[site.lang].main.middle_name }}
-              {%- endif -%}
-              {% if site.translations[site.lang].main.last_name %}
-                {{ site.translations[site.lang].main.last_name }}
-              {%- endif -%}
+              {% if site.translations[site.lang].main.first_name %}<span class="font-weight-bold">{{ site.translations[site.lang].main.first_name }}</span>{% endif %}{% if site.translations[site.lang].main.middle_name %} {{ site.translations[site.lang].main.middle_name }}{% endif %}{% if site.translations[site.lang].main.last_name %} {{ site.translations[site.lang].main.last_name }}{% endif %}
             {%- else -%}
               {{- site.title -}}
             {%- endif -%}