Skip to content

Commit ba187d6

Browse files
committed
Got rid of split+join; uniform name calling
1 parent cd3fa1e commit ba187d6

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

_includes/footer.html

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
{% capture name_components %}
2-
{% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}
3-
{% if site.translations[site.lang].main.middle_name %}{{ site.translations[site.lang].main.middle_name }}{% endif %}
4-
{% if site.translations[site.lang].main.last_name %}{{ site.translations[site.lang].main.last_name }}{% endif %}
5-
{% endcapture %}
61
{% if site.footer_fixed %}
72
<footer class="fixed-bottom">
83
<div class="container mt-0">
9-
&copy; Copyright {{ site.time | date: '%Y' }} {{ name_components | split:' ' | join:' ' }}. {% t main.footer_text %}
4+
&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 %}
105
{%- if site.impressum_path -%}
116
<a href="{{ site.url }}{{ site.baseurl }}{{ site.impressum_path }}">Impressum</a>.
127
{%- endif -%}
@@ -18,7 +13,7 @@
1813
{%- else -%}
1914
<footer class="sticky-bottom mt-5">
2015
<div class="container">
21-
&copy; Copyright {{ site.time | date: '%Y' }} {{ name_components | split:' ' | join:' ' }}. {% t main.footer_text %}
16+
&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 %}
2217
{%- if site.impressum_path -%}
2318
<a href="{{ site.url }}{{ site.baseurl }}{{ site.impressum_path }}">Impressum</a>.
2419
{%- endif -%}

_includes/metadata.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
-->
1313
<meta http-equiv="Permissions-Policy" content="interest-cohort=()" />
1414
{%- endif %}
15-
{% capture name_components %}
16-
{% if site.translations[site.lang].main.first_name %}{{ site.translations[site.lang].main.first_name }}{% endif %}
17-
{% if site.translations[site.lang].main.middle_name %}{{ site.translations[site.lang].main.middle_name }}{% endif %}
18-
{% if site.translations[site.lang].main.last_name %}{{ site.translations[site.lang].main.last_name }}{% endif %}
19-
{% endcapture %}
15+
2016
{%- if site.title == "blank" -%}
21-
{%- capture title -%}{{ name_components | split:' ' | join:' ' }}{%- endcapture -%}
17+
{%- 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 -%}
2218
{%- else -%}
2319
{%- capture title -%}{{ site.title }}{%- endcapture -%}
2420
{%- endif -%}
@@ -71,7 +67,7 @@
7167
{{ title }}
7268
{%- endif -%}
7369
</title>
74-
<meta name="author" content="{{ name_components | split:' ' | join:' ' }}" />
70+
<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 %}" />
7571
<meta name="description" content="{%- if page.description -%}{{ page.description }}{%- else -%}{{ site.description }}{%- endif -%}" />
7672
{%- if page.keywords or site.keywords %}
7773
<meta name="keywords" content="{%- if page.keywords -%}{{ page.keywords }}{%- else -%}{{ site.keywords }}{%- endif -%}" />
@@ -259,7 +255,7 @@
259255
"author":
260256
{
261257
"@type": "Person",
262-
"name": "{{ name_components | split:' ' | join:' ' }}"
258+
"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 %}"
263259
},
264260
"url": "{{ page.url | prepend: site.baseurl | prepend: site.url }}",
265261
"@type": "{%- if is_blog_post -%}BlogPosting{%- else -%}WebSite{%- endif -%}",
@@ -268,7 +264,7 @@
268264
{% if sameaslinks != blank -%}
269265
"sameAs": {{ sameaslinks }},
270266
{%- endif %}
271-
"name": "{{ name_components | split:' ' | join:' ' }}",
267+
"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 %}",
272268
"@context": "https://schema.org"
273269
}
274270
</script>

_layouts/about.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@
77
<header class="post-header">
88
<h1 class="post-title">
99
{%- if site.title == "blank" -%}
10-
{% if site.translations[site.lang].main.first_name %}
11-
<span class="font-weight-bold">{{ site.translations[site.lang].main.first_name }}</span>
12-
{%- endif -%}
13-
{% if site.translations[site.lang].main.middle_name %}
14-
{{ site.translations[site.lang].main.middle_name }}
15-
{%- endif -%}
16-
{% if site.translations[site.lang].main.last_name %}
17-
{{ site.translations[site.lang].main.last_name }}
18-
{%- endif -%}
10+
{% 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 %}
1911
{%- else -%}
2012
{{- site.title -}}
2113
{%- endif -%}

0 commit comments

Comments
 (0)