From bd0dbfa7bc65af54e6b5b36e6ecbc411504ddae2 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 10 Jan 2024 07:11:57 +0000
Subject: [PATCH] Make years of experience dynamic based on the

...current year
---
 app/config/sculpin_site.yml           | 1 -
 source/_includes/about-me.html.twig   | 4 +++-
 source/_includes/macros.html.twig     | 3 +++
 source/_pages/call.html.twig          | 6 ++++--
 source/_pages/drupal-upgrade.md       | 4 +++-
 source/_pages/index.md                | 4 +++-
 source/_pages/pair.html.twig          | 4 +++-
 source/_pages/press.md                | 4 +++-
 source/_pages/speaker.md              | 4 +++-
 source/_pages/team-coaching.html.twig | 4 +++-
 10 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 source/_includes/macros.html.twig

diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index d7731d1b5..d6b3e6c59 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -2,7 +2,6 @@
 name: Oliver Davies
 slogan: Certified Drupal expert, Developer and Consultant
 email: oliver+website@oliverdavies.uk
-yearsExperience: 16
 assets_version: 3
 
 meta:
diff --git a/source/_includes/about-me.html.twig b/source/_includes/about-me.html.twig
index 447c2daf3..823b4bfd0 100644
--- a/source/_includes/about-me.html.twig
+++ b/source/_includes/about-me.html.twig
@@ -1,3 +1,5 @@
+{% import 'macros' as macros %}
+
 <div>
   <h2 class="text-xl font-bold">About me</h2>
 
@@ -8,7 +10,7 @@
       </div>
 
       <div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white hover:prose-a:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-grey-400 prose-code:before:content-[''] prose-code:after:content-['']">
-        <p>I'm an Acquia-certified Drupal Triple Expert with {{ site.yearsExperience }} years of experience, an open-source software maintainer and Drupal core contributor, <a href="/talks">public speaker</a>, and host of the <a href="/podcast">Beyond Blocks podcast</a>. </p>
+        <p>I'm an Acquia-certified Drupal Triple Expert with {{ macros.yearsExperience }} years of experience, an open-source software maintainer and Drupal core contributor, <a href="/talks">public speaker</a>, and host of the <a href="/podcast">Beyond Blocks podcast</a>.</p>
       </div>
     </div>
   </div>
diff --git a/source/_includes/macros.html.twig b/source/_includes/macros.html.twig
new file mode 100644
index 000000000..b532d0987
--- /dev/null
+++ b/source/_includes/macros.html.twig
@@ -0,0 +1,3 @@
+{% macro yearsExperience() %}
+  {{- today|date('Y') - 2007 -}}
+{% endmacro %}
diff --git a/source/_pages/call.html.twig b/source/_pages/call.html.twig
index c3e3e6a4b..1d6bead7f 100644
--- a/source/_pages/call.html.twig
+++ b/source/_pages/call.html.twig
@@ -26,6 +26,8 @@ faqs:
 
 {% block content %}
 
+{% import 'macros' as macros %}
+
 {# <h2>Who is this for?</h2> #}
 
 {# Pain #}
@@ -34,7 +36,7 @@ faqs:
 
 {# Fix #}
 
-<p>As a professional Software Developer and Consultant with over {{ site.yearsExperience }} years of Drupal and PHP experience, I have a lot of knowledge that I use to help customers and their projects.</p>
+<p>As a professional Software Developer and Consultant with {{ macros.yearsExperience }} years of Drupal and PHP experience, I have a lot of knowledge that I use to help customers and their projects.</p>
 
 <h2>Some things I can help you with</h2>
 
@@ -84,7 +86,7 @@ faqs:
 <h2>Who am I?</h2>
 
 <ul>
-  <li>I'm an Acquia-certified Drupal expert with over {{ site.yearsExperience}} years of professional development experience.</li>
+  <li>I'm an Acquia-certified Drupal expert with {{ macros.yearsExperience }} years of professional development experience.</li>
   <li>I'm a former Drupal Association employee who was responsible for improving and maintaining Drupal.org.</li>
   <li>I'm a Drupal core contributor and maintain numerous Drupal projects, including the Override Node Options module, which is used on over 38,000 websites.</li>
   <li>I'm a multiple-time DrupalCon speaker who regularly presents talks and workshops at conferences and meetups.</li>
diff --git a/source/_pages/drupal-upgrade.md b/source/_pages/drupal-upgrade.md
index e7a5371f5..5d5438279 100644
--- a/source/_pages/drupal-upgrade.md
+++ b/source/_pages/drupal-upgrade.md
@@ -5,6 +5,8 @@ button:
   url: https://buy.stripe.com/aEU4h0gBc4ro0p27sz
 ---
 
+{% import 'macros' as macros %}
+
 {# Pain #}
 
 Drupal 7 will be unsupported on the **5th of January 2025**.
@@ -66,7 +68,7 @@ An upgrade roadmap is a personalised audit of your Drupal website and includes d
 
 ## Who am I?
 
-* I'm an Acquia-certified Drupal expert with over {numberOfYears} years of professional development experience.
+* I'm an Acquia-certified Drupal expert with {{ macros.yearsExperience }} years of professional development experience.
 * I'm a former Drupal Association employee who was responsible for improving and maintaining Drupal.org.
 * I'm a Drupal core contributor and maintain numerous Drupal projects, including the Override Node Options module, which is used on over 38,000 websites.
 * I'm a multiple-time DrupalCon speaker who regularly presents talks and workshops at conferences and meetups.
diff --git a/source/_pages/index.md b/source/_pages/index.md
index f9e640f3c..c41a606fd 100644
--- a/source/_pages/index.md
+++ b/source/_pages/index.md
@@ -9,7 +9,9 @@ meta:
 
 {% block content %}
 
-Hi, I'm Oliver. I'm an Acquia-certified Drupal Triple Expert and Software Development Consultant with {{ site.yearsExperience }} years of experience.
+{% import 'macros' as macros %}
+
+Hi, I'm Oliver. I'm an Acquia-certified Drupal Triple Expert and Software Development Consultant with {{ macros.yearsExperience }} years of experience.
 
 I'm a Drupal core contributor, module and theme maintainer, former Developer for the Drupal Association, and multiple-time DrupalCon speaker.
 
diff --git a/source/_pages/pair.html.twig b/source/_pages/pair.html.twig
index e6117b01a..bd03440c1 100644
--- a/source/_pages/pair.html.twig
+++ b/source/_pages/pair.html.twig
@@ -6,6 +6,8 @@ link: https://savvycal.com/opdavies/pair
 
 {% block content %}
 
+{% import 'macros' as macros %}
+
 {# Pain #}
 
 <p>Are you stuck adding a new feature or fixing a bug?</p>
@@ -48,7 +50,7 @@ link: https://savvycal.com/opdavies/pair
 <h2>Who am I?</h2>
 
 <ul>
-  <li>I'm an Acquia-certified Drupal expert with over {{ site.yearsExperience }} years of professional development experience.</li>
+  <li>I'm an Acquia-certified Drupal expert with {{ macros.yearsExperience }} years of professional development experience.</li>
   <li>I'm a former Drupal Association employee who was responsible for improving and maintaining Drupal.org.</li>
   <li>I'm a Drupal core contributor and maintain numerous Drupal projects, including the Override Node Options module, which is used on over 38,000 websites.</li>
   <li>I'm a multiple-time DrupalCon speaker who regularly presents talks and workshops at conferences and meetups.</li>
diff --git a/source/_pages/press.md b/source/_pages/press.md
index 33d3d07a5..0408a7aaf 100644
--- a/source/_pages/press.md
+++ b/source/_pages/press.md
@@ -2,13 +2,15 @@
 title: Press Info
 ---
 
+{% import 'macros' as macros %}
+
 The following information is provided as a cut-and-paste resource for conference organisers, media professionals, podcast hosts, and other interested parties.
 
 Please feel free to use anything here as-is without checking with me first. If you have additional questions, you can <a href="mailto:{{ site.email }}">email me directly</a>.
 
 ## Short Bio
 
-Oliver is a Software Developer and Drupal expert with over {{ site.yearsExperience }} years experience. He specialises in code quality, automated testing and test-driven development.
+Oliver is a Software Developer and Drupal expert with {{ macros.yearsExperience }} years experience. He specialises in code quality, automated testing and test-driven development.
 
 ## Sample Topics
 
diff --git a/source/_pages/speaker.md b/source/_pages/speaker.md
index 5a4d762df..aa4f84f54 100644
--- a/source/_pages/speaker.md
+++ b/source/_pages/speaker.md
@@ -2,9 +2,11 @@
 title: Speaker Information
 ---
 
+{% import 'macros' as macros %}
+
 ## Bio
 
-Oliver is a Software Developer and Drupal Expert with {{ site.yearsExperience }} years of experience. As well as consulting on large Drupal projects, Oliver helps Drupal Developers learn automated testing and test-driven development via a free email course and paid coaching and workshops. He regularly contributes to open-source software projects, including Drupal core.
+Oliver is a Software Developer and Drupal Expert with {{ macros.yearsExperience }} years of experience. As well as consulting on large Drupal projects, Oliver helps Drupal Developers learn automated testing and test-driven development via a free email course and paid coaching and workshops. He regularly contributes to open-source software projects, including Drupal core.
 
 ## Photos
 
diff --git a/source/_pages/team-coaching.html.twig b/source/_pages/team-coaching.html.twig
index 57969afd8..fdae26a09 100644
--- a/source/_pages/team-coaching.html.twig
+++ b/source/_pages/team-coaching.html.twig
@@ -15,6 +15,8 @@ meta:
 ---
 
 {% block content %}
+  {% import 'macros' as macros %}
+
   <div class="space-y-16">
     <div>
       {# Pain #}
@@ -109,7 +111,7 @@ meta:
       <h2 class="text-lg font-bold">Who am I?</h2>
 
       <ul>
-        <li>I'm an Acquia-certified Drupal expert with over {{ site.yearsExperience }} years of professional development experience.</li>
+        <li>I'm an Acquia-certified Drupal expert with {{ macros.yearsExperience }} years of professional development experience.</li>
         <li>I'm a former Drupal Association employee who was responsible for improving and maintaining Drupal.org.</li>
         <li>I'm a Drupal core contributor and maintain numerous Drupal projects, including the Override Node Options module, which is used on over 38,000 websites.</li>
         <li>I'm a multiple-time DrupalCon speaker who regularly presents talks and workshops at conferences and meetups.</li>