feat: complete change to gettext from homebrew i18n solution

priv/starter_templates/templates/not-found.liquid

@@ -6,12 +6,10 @@
       <section class="not-found" data-template="not-found">
         <article>
           <h1>404</h1>
-          {% assign default_not_found_message = 'render.notFound.message' | i18n: language %}
-          {% assign default_not_found_back = 'render.notFound.back' | i18n: language %}
-          <p>{{ not_found_message | default: default_not_found_message }}</p>
-          <p><a href="/" role="button">{{ not_found_back_label | default: default_not_found_back }}</a></p>
+          <p>{{ not_found_message }}</p>
+          <p><a href="/" role="button">{{ not_found_back_label }}</a></p>
         </article>
       </section>
     </main>
   </body>
-</html>
+</html>

priv/starter_templates/templates/partials/language-switcher.liquid

@@ -1,5 +1,5 @@
 {% if blog_languages.size > 1 %}
-<nav class="language-switcher" aria-label="{{ 'render.languageSwitcher.ariaLabel' | i18n: language }}">
+<nav class="language-switcher" aria-label="{{ labels.language_switcher_label }}">
   {% for lang in blog_languages %}
     {% if lang.is_current %}
       <span class="language-switcher-badge language-switcher-badge-current" aria-current="true" title="{{ lang.code }}">{{ lang.flag }}</span>
@@ -7,15 +7,15 @@
       <a class="language-switcher-badge" href="{{ lang.href_prefix | default: '/' }}" data-lang-prefix="{{ lang.href_prefix }}" title="{{ lang.code }}">{{ lang.flag }}</a>
     {% endif %}
   {% endfor %}
-  <div class="blog-search-widget" aria-label="{{ 'render.search.ariaLabel' | i18n: language }}">
-    <button type="button" class="blog-search-toggle" data-blog-search-toggle aria-label="{{ 'render.search.ariaLabel' | i18n: language }}">
+  <div class="blog-search-widget" aria-label="{{ labels.site_search_label }}">
+    <button type="button" class="blog-search-toggle" data-blog-search-toggle aria-label="{{ labels.site_search_label }}">
       <svg aria-hidden="true" viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false">
         <circle cx="11" cy="11" r="8"></circle>
         <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
       </svg>
     </button>
     <div class="blog-search-panel" data-blog-search-panel hidden>
-      <div id="blog-search" data-blog-search-root data-search-placeholder="{{ 'render.search.placeholder' | i18n: language }}"></div>
+      <div id="blog-search" data-blog-search-root data-search-placeholder="{{ labels.search_placeholder }}"></div>
     </div>
   </div>
 </nav>
@@ -27,15 +27,15 @@
 }());
 </script>
 {% else %}
-<div class="blog-search-standalone" aria-label="{{ 'render.search.ariaLabel' | i18n: language }}">
-  <button type="button" class="blog-search-toggle" data-blog-search-toggle aria-label="{{ 'render.search.ariaLabel' | i18n: language }}">
+<div class="blog-search-standalone" aria-label="{{ labels.site_search_label }}">
+  <button type="button" class="blog-search-toggle" data-blog-search-toggle aria-label="{{ labels.site_search_label }}">
     <svg aria-hidden="true" viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false">
       <circle cx="11" cy="11" r="8"></circle>
       <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
     </svg>
   </button>
   <div class="blog-search-panel" data-blog-search-panel hidden>
-    <div id="blog-search" data-blog-search-root data-search-placeholder="{{ 'render.search.placeholder' | i18n: language }}"></div>
+    <div id="blog-search" data-blog-search-root data-search-placeholder="{{ labels.search_placeholder }}"></div>
   </div>
 </div>
-{% endif %}
+{% endif %}

priv/starter_templates/templates/partials/menu-items.liquid

@@ -22,8 +22,8 @@
         data-blog-calendar-toggle
         {% if calendar_initial_year %}data-blog-calendar-year="{{ calendar_initial_year }}"{% endif %}
         {% if calendar_initial_month %}data-blog-calendar-month="{{ calendar_initial_month }}"{% endif %}
-        aria-label="{{ 'render.calendar.open' | i18n: language }}"
-        title="{{ 'render.calendar.open' | i18n: language }}"
+        aria-label="{{ labels.calendar_open_label }}"
+        title="{{ labels.calendar_open_label }}"
       >
         <svg aria-hidden="true" viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" focusable="false">
           <rect x="3" y="5" width="18" height="16" rx="2" ry="2"></rect>
@@ -37,27 +37,27 @@
         id="blog-calendar"
         class="blog-calendar-panel"
         data-blog-calendar-panel
-        data-i18n-loading="{{ 'render.calendar.loading' | i18n: language }}"
-        data-i18n-error="{{ 'render.calendar.error' | i18n: language }}"
+        data-i18n-loading="{{ labels.calendar_loading_label }}"
+        data-i18n-error="{{ labels.calendar_error_label }}"
         hidden
       >
         <header class="blog-calendar-header">
-          <strong>{{ 'render.calendar.title' | i18n: language }}</strong>
+          <strong>{{ labels.calendar_title_label }}</strong>
           <button
             type="button"
             class="blog-calendar-close"
             data-blog-calendar-close
-            aria-label="{{ 'render.calendar.close' | i18n: language }}"
-            title="{{ 'render.calendar.close' | i18n: language }}"
+            aria-label="{{ labels.calendar_close_label }}"
+            title="{{ labels.calendar_close_label }}"
           >
             ×
           </button>
         </header>
         <div class="blog-calendar-content">
           <div data-blog-calendar-root></div>
-          <p class="blog-calendar-status" data-blog-calendar-status>{{ 'render.calendar.loading' | i18n: language }}</p>
+          <p class="blog-calendar-status" data-blog-calendar-status>{{ labels.calendar_loading_label }}</p>
         </div>
       </section>
     </li>
   {% endif %}
-</ul>
+</ul>

priv/starter_templates/templates/partials/menu.liquid

@@ -1,7 +1,7 @@
 <nav class="blog-menu">
   {% if menu_items and menu_items.size > 0 %}
-    {% render 'partials/menu-items', items: menu_items, include_calendar: true, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month %}
+    {% render 'partials/menu-items', items: menu_items, include_calendar: true, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month, labels: labels %}
   {% else %}
-    {% render 'partials/menu-items', items: menu_items, include_calendar: true, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month %}
+    {% render 'partials/menu-items', items: menu_items, include_calendar: true, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month, labels: labels %}
   {% endif %}
-</nav>
+</nav>

priv/starter_templates/templates/post-list.liquid

@@ -3,32 +3,30 @@
   {% render 'partials/head', page_title: page_title, pico_stylesheet_href: pico_stylesheet_href, language_prefix: language_prefix %}
   <body>
     <main>
-      {% render 'partials/language-switcher', blog_languages: blog_languages, language: language %}
+      {% render 'partials/language-switcher', blog_languages: blog_languages, language: language, labels: labels %}
       {% if archive_context %}
         {% if show_archive_range_heading and min_date and max_date %}
           {% if archive_context.kind == 'tag' or archive_context.kind == 'category' %}
             <h1 class="archive-heading">{{ archive_context.name }} - {{ min_date.day }}.{{ min_date.month }}.{{ min_date.year }} - {{ max_date.day }}.{{ max_date.month }}.{{ max_date.year }}</h1>
           {% else %}
-            <h1 class="archive-heading">{{ 'render.archive' | i18n: language }} {{ min_date.day }}.{{ min_date.month }}.{{ min_date.year }} - {{ max_date.day }}.{{ max_date.month }}.{{ max_date.year }}</h1>
+            <h1 class="archive-heading">{{ labels.archive_label }} {{ min_date.day }}.{{ min_date.month }}.{{ min_date.year }} - {{ max_date.day }}.{{ max_date.month }}.{{ max_date.year }}</h1>
           {% endif %}
         {% else %}
           {% if archive_context.kind == 'tag' or archive_context.kind == 'category' %}
             <h1 class="archive-heading">{{ archive_context.name }}</h1>
           {% elsif archive_context.kind == 'month' and archive_context.month and archive_context.year %}
-            {% assign month_key = 'render.month.' | append: archive_context.month %}
-            <h1 class="archive-heading">{{ 'render.archive' | i18n: language }} {{ month_key | i18n: language }} {{ archive_context.year }}</h1>
+            <h1 class="archive-heading">{{ labels.archive_label }} {{ archive_month_name }} {{ archive_context.year }}</h1>
           {% elsif archive_context.kind == 'year' and archive_context.year %}
-            <h1 class="archive-heading">{{ 'render.archive' | i18n: language }} {{ archive_context.year }}</h1>
+            <h1 class="archive-heading">{{ labels.archive_label }} {{ archive_context.year }}</h1>
           {% elsif archive_context.kind == 'day' and archive_context.day and archive_context.month and archive_context.year %}
-            {% assign day_month_key = 'render.month.' | append: archive_context.month %}
-            <h1 class="archive-heading">{{ 'render.archive' | i18n: language }} {{ archive_context.day }}. {{ day_month_key | i18n: language }} {{ archive_context.year }}</h1>
+            <h1 class="archive-heading">{{ labels.archive_label }} {{ archive_context.day }}. {{ archive_month_name }} {{ archive_context.year }}</h1>
           {% else %}
             <h1 class="archive-heading">{{ page_title }}</h1>
           {% endif %}
         {% endif %}
       {% endif %}
 
-      {% render 'partials/menu', menu_items: menu_items, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month %}
+      {% render 'partials/menu', menu_items: menu_items, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month, labels: labels %}
 
       <section class="post-list" data-template="post-list" data-list-page="{{ is_list_page }}" data-first-page="{{ is_first_page }}" data-last-page="{{ is_last_page }}">
         {% for day_block in day_blocks %}
@@ -72,15 +70,15 @@
       </section>
 
       {% if has_prev_page or has_next_page %}
-        <nav class="preview-pagination" aria-label="{{ 'render.pagination.label' | i18n: language }}">
+        <nav class="preview-pagination" aria-label="{{ labels.pagination_label }}">
           {% if has_prev_page %}
-            <a href="{{ prev_page_href }}" class="preview-pagination-link" aria-label="{{ 'render.pagination.newer' | i18n: language }}">{{ 'render.pagination.newer' | i18n: language }}</a>
+            <a href="{{ prev_page_href }}" class="preview-pagination-link" aria-label="{{ labels.newer_label }}">{{ labels.newer_label }}</a>
           {% else %}
             <span class="spacer"></span>
           {% endif %}
 
           {% if has_next_page %}
-            <a href="{{ next_page_href }}" class="preview-pagination-link" aria-label="{{ 'render.pagination.older' | i18n: language }}">{{ 'render.pagination.older' | i18n: language }}</a>
+            <a href="{{ next_page_href }}" class="preview-pagination-link" aria-label="{{ labels.older_label }}">{{ labels.older_label }}</a>
           {% else %}
             <span class="spacer"></span>
           {% endif %}
@@ -88,4 +86,4 @@
       {% endif %}
     </main>
   </body>
-</html>
+</html>

priv/starter_templates/templates/single-post.liquid

@@ -3,11 +3,11 @@
   {% render 'partials/head', page_title: page_title, pico_stylesheet_href: pico_stylesheet_href, alternate_links: alternate_links, language_prefix: language_prefix %}
   <body>
     <main>
-      {% render 'partials/language-switcher', blog_languages: blog_languages, language: language %}
+      {% render 'partials/language-switcher', blog_languages: blog_languages, language: language, labels: labels %}
       <h1>{{ post.title }}</h1>
-      {% render 'partials/menu', menu_items: menu_items, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month %}
+      {% render 'partials/menu', menu_items: menu_items, language: language, calendar_initial_year: calendar_initial_year, calendar_initial_month: calendar_initial_month, labels: labels %}
       {% if post_categories.size > 0 or post_tags.size > 0 %}
-      <div class="single-post-taxonomy" aria-label="{{ 'render.taxonomy.ariaLabel' | i18n: language }}">
+      <div class="single-post-taxonomy" aria-label="{{ labels.taxonomy_label }}">
         {% for category in post_categories %}
         <a class="single-post-taxonomy-bubble single-post-taxonomy-bubble-category" href="/category/{{ category | slugify | url_encode }}/">{{ category | escape }}</a>
         {% endfor %}
@@ -21,8 +21,8 @@
         <div class="post">{{ post.content }}</div>
       </article>
       {% if backlinks.size > 0 %}
-      <div class="single-post-backlinks" aria-label="{{ 'render.backlinks.ariaLabel' | i18n: language }}">
-        <span class="single-post-backlinks-label">{{ 'render.backlinks.label' | i18n: language }}</span>
+      <div class="single-post-backlinks" aria-label="{{ labels.backlinks_label }}">
+        <span class="single-post-backlinks-label">{{ labels.linked_from_label }}</span>
         {% for backlink in backlinks %}
         <a class="single-post-taxonomy-bubble single-post-backlink-bubble" href="{{ backlink.path }}">{{ backlink.display_slug }}</a>
         {% endfor %}
@@ -30,4 +30,4 @@
       {% endif %}
     </main>
   </body>
-</html>
+</html>