Merge remote-tracking branch 'origin/main' into resources

Gemfile.lock

@@ -128,7 +128,7 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     unicode-display_width (2.6.0)
     webrick (1.8.2)

_config.yml

@@ -49,18 +49,25 @@ sass:
 
 include:
   - _pages
+  - _redirects
 exclude:
   - .jekyll-cache/
 languages: ['en', 'nl']
-exclude_from_localizations: ['assets', 'admin', 'vendor']
+exclude_from_localizations: ['assets', 'admin', 'vendor', '_redirects']
+# We don't want english to be any more or less special than other languages
+default_locale_in_subfolder: true
+
+# header menu items
+# text: the i18n key for link
+# namespace: the namespace that matches the page's frontmatter namespac
 header_themes:
-  - url: /about
-    text: about
-  - url: /events
-    text: events
+  - text: about
+    namespace: about
+  - text: events
+    namespace: events
 # TODO: Uncomment when we want to go live with resources
-#  - url: /resources
-#    text: resources
+#  - text: resources
+#    namespace: resources
 
 permalink: pretty
 future: true

_events/biweekly-planning-meeting-1.md

@@ -0,0 +1,10 @@
+---
+title: Biweekly Planning Meeting
+date: 2024-11-04 18:00
+locations:
+  - The Netherlands
+hide_form: false
+---
+Our biweekly action planning meeting, hosted from the TWC Slack.
+
+We hope to open this beyond slack one day!

_events/biweekly-planning-meeting-2.md

@@ -0,0 +1,10 @@
+---
+title: Biweekly Planning Meeting
+date: 2024-11-18 18:00
+locations:
+  - The Netherlands
+hide_form: false
+---
+Our biweekly action planning meeting, hosted from the TWC Slack.
+
+We hope to open this beyond slack one day!

_i18n/en.yml

@@ -32,7 +32,7 @@ home:
 
 connect:
   info: Get involved!
-  description: The easiest way to get involved is to attend an upcoming <a href="/events" >events</a>.
+  description: The easiest way to get involved is to attend an upcoming <a href="/en/events" >events</a>.
   email: Your email
   name: Your name
   public_link: Social media link

_i18n/nl.yml

@@ -32,7 +32,7 @@ home:
 
 connect:
   info: Sluit je aan!
-  description: De makkelijkste manier om mee te doen is door deel te nemen aan een van onze komende <a href="/events">evenementen</a>.
+  description: De makkelijkste manier om mee te doen is door deel te nemen aan een van onze komende <a href="/nl/activiteiten">evenementen</a>.
   email: Email
   name: Naam
   public_link: Sociale media link

_includes/events.html

@@ -1,5 +1,5 @@
 {% unless page.permalink == '/events' %}
-  <a href="/events">{% t home.events.more %}</a>
+  <a href="{% tl events %}">{% t home.events.more %}</a>
 {% endunless %}
 <ul
   class="list -no-list-style l-stack -vertical"

_includes/header.html

@@ -1,6 +1,6 @@
 <header class="header dropdown__header" role="banner">
   <div>
-    <a href="/">
+    <a href="{% tl index %}">
       <h1 class="logo">{{ site.title }}</h1>
       <p class="work">Tech <span class="link">Werkers</span> NL</p>
     </a>
@@ -11,13 +11,13 @@ <h1 class="logo">{{ site.title }}</h1>
       <ul id="nav" class="dropdown__menu hide">
         {% for link in site.header_themes %}
           <li>
-            <a href="{{link.url}}">{{ site.translations[site.lang].pages[link.text] }}</a>
+            <a href="{% tl link.namespace %}">{{ site.translations[site.lang].pages[link.text] }}</a>
           </li>
         {% endfor %}
       </ul>
     </li>
     <li>
-      <a href="{% translate_link join %}">{% t connect.subscribe %}</a>
+      <a href="{% tl join %}">{% t connect.subscribe %}</a>
     </li>
   </ul>
 </header>

_includes/links.html

@@ -4,7 +4,7 @@
       name="subscribe"
       class="join-form"
       method="POST"
-      action="/welcome"
+      action="{% tl welcome %}"
       data-netlify="true"
     >
       <div class="control">

_pages/events.md

@@ -2,6 +2,7 @@
 layout: page
 permalink: /events
 permalink_nl: /activiteiten
+namespace: events
 languages: ['en', 'nl']
 ---
 

_pages/subscribe-redirect.md

@@ -1,6 +1,8 @@
 ---
 layout: page
 permalink: /welcome
+permalink_nl: /welkom
+namespace: welcome
 hide_form: true
 ---
 

_redirects

@@ -1,2 +1,20 @@
+# All redirects in this file are parsed down from top to bottom
+
 # Redirect default Netlify subdomain to primary domain
 https://techwerkers.netlify.com/* https://techwerkers.nl/:splat 301!
+
+# Root domain redirects
+/ /nl/ 301! Language=nl
+/ /en/ 301! Language=en
+/ /en/ 301!
+
+# Locale specific redirects
+/over_ons        /nl/over_ons 301!
+/activiteiten/*  /nl/activitieten/:splat 301!
+/activiteiten    /nl/activitieten 301!
+/about           /en/about 301!
+/events/*        /en/events/:splat 301!
+/events          /en/events 301!
+
+# Note: do not include /* redirects, because you are likely to end up in a loop
+# unless they're in the localised list above

docs/i18n.md

@@ -0,0 +1,30 @@
+# I18n
+
+Accessibility is important. Reading things in your own language is also important.
+
+## Default locales
+
+The fallback locale is `en`. Apart from that, landing on techwerkers.nl should redirect to techwerkers.nl/en/. Otherwise there is no special treatment of the `en` locale.
+
+## Translation keys
+
+`_i18n/` contains all the things you should need for translation keys. In
+general, it is better to use a translation key than it is to switch between languages.
+
+❌ `<h1>Something</h1>`
+
+✅ `<h1>{{ t 'something' }}</h1>`
+
+✅ `<h1>{{ translate 'something' }}</h1>`
+
+👆 The above assumes a key of `something` exists in locale file in `_i18n/`.
+
+## Links
+
+Use `namespace` frontmatter attribute on pages, and the `translate_link` or `tl` tag in the `href`.
+
+❌ `<a href="/something">Something</a>`
+
+✅ `<a href="{% tl something %}">Something</a>`
+
+✅ `<a href="{% translate_link something %}">Something</a>`