Merge pull request #206 from AntennaPod/update-ci

ByteHamster · web-flow · commit 7ff25cd07d66 · 2023-01-14T14:42:51.000+01:00
Update Ruby on CI
diff --git a/.github/workflows/autoreview.yml b/.github/workflows/autoreview.yml
@@ -13,11 +13,11 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - run: sudo apt-get install ruby-full build-essential zlib1g-dev git
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7.x'
+          ruby-version: '3.2.0'
       - run: gem install bundler jekyll --no-document
       - run: bundle install
       - run: bundle exec jekyll build
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,11 +9,11 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - run: sudo apt-get install ruby-full build-essential zlib1g-dev git
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7.x'
+          ruby-version: '3.2.0'
       - run: gem install bundler jekyll --no-document
       - run: bundle install
       - run: bundle exec jekyll build
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,95 +1,100 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.7)
+    activesupport (6.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.1.10)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
-    ffi (1.15.0)
-    ffi (1.15.0-x64-mingw32)
+    ffi (1.15.5)
+    ffi (1.15.5-x64-mingw32)
     forwardable-extended (2.6.0)
-    html-pipeline (2.14.0)
+    google-protobuf (3.21.12)
+    google-protobuf (3.21.12-x64-mingw32)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    http_parser.rb (0.8.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.0)
+    jekyll (4.3.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-mentions (1.6.0)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
-    jekyll-multiple-languages-plugin (1.7.0)
+    jekyll-multiple-languages-plugin (1.8.0)
       jekyll (>= 2.0, < 5.0)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.5.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.5.1)
-    minitest (5.14.4)
-    nokogiri (1.11.3)
-      mini_portile2 (~> 2.5.0)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
+    nokogiri (1.14.0)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.11.3-x64-mingw32)
+    nokogiri (1.14.0-x64-mingw32)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rb-fsevent (0.11.0)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (4.0.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc (2.4.0-x64-mingw32)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    sass-embedded (1.57.1)
+      google-protobuf (~> 3.21)
+      rake (>= 10.0.0)
+    sass-embedded (1.57.1-x64-mingw32)
+      google-protobuf (~> 3.21)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2022.7)
       tzinfo (>= 1.0.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.4.2)
     wdm (0.1.1)
     webrick (1.7.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
diff --git a/_i18n/en.yml b/_i18n/en.yml
@@ -6,7 +6,7 @@ titles:
   documentation: "Documentation"
   download: "Download AntennaPod"
   forum: "Forum"
-  media: "Media Kit"
+  media-kit: "Media Kit"
   license: "License"
   privacy: "Privacy Policy"
 
@@ -34,6 +34,7 @@ generic:
     share-md: "Share on Mastodon"
     share-tw: "Share on Twitter"
     share-eml: "Share via email"
+    logo: "AntennaPod Logo"
   eml-share:
     subject: "I wanted you to see this"
     body: "Check out this article"
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,17 +1,20 @@
-  {% capture title %}{% t page.title %}{% endcapture %}
-  {% unless title.size > 0 %}{% assign title = page.title %}{% endunless %}
-  {% capture title %}{% if title.size > 0 %}{{ title }} – {{ site.title }}{% else %}{{ site.title }} – {% t homepage.header %}{% endif %}{% endcapture %}
+  {% if page.layout == "blog" %}
+    {% capture title %}{{ page.title }}{% endcapture %}
+  {% elsif page.title %}
+    {% capture title %}{% t page.title %}{% endcapture %}
+  {% else %}
+    {% capture title %}{{ site.title }} – {% t homepage.header %}{% endcapture %}
+  {% endif %}
 
-  {% capture descrlong %}
-    {% capture descrtransl %}{% t page.excerpt %}{% endcapture %}
-    {% if descrtransl.size > 0 %}
-      {{ descrtransl }}
-    {% elsif page.excerpt %}
-      {{ page.excerpt }}
-    {% else %}
-      {% t homepage.description %}
-    {% endif %}
-  {% endcapture %}
+  {% if page.layout == "blog" %}
+    {% capture descrlong %}{{ page.excerpt }}{% endcapture %}
+  {% elsif page.layout == "doc" %}
+    {% capture descrlong %}{{ page.excerpt }}{% endcapture %}
+  {% elsif page.excerpt %}
+    {% capture descrlong %}{% t page.excerpt %}{% endcapture %}
+  {% else %}
+    {% capture descrlong %}{% t homepage.description %}{% endcapture %}
+  {% endif %}
   {% capture description %}{{ descrlong | strip | strip_html | strip_newlines | truncate: 180 }}{% endcapture %}
 
   {% capture image %}
diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -15,10 +15,6 @@
             {% assign author = site.data.authors[page.author] %}
 
             <header class="post-header">
-              <p class="size-14 color-orange-900 mb-2 weight-500">
-              {% capture category %}{{ page.category }}{% endcapture %}
-              {% t news.filters.{{ category }} %}
-              </p>
               <h1 class="size-36 weight-700 color-gray-900">{{ page.title }}</h1>
               {% assign words = page.content | number_of_words %}
               {% if words < 360 %}
@@ -47,87 +43,13 @@ <h1 class="size-36 weight-700 color-gray-900">{{ page.title }}</h1>
   </div>
   <div class="container-fluid">
     <div class="container py-3">
-
-
       <div class="row no-gutters justify-content-center pb-4">
         <div class="col-lg-9">
           <article class="post-content pb-3">
             {{ content }}
           </article>
         </div>
       </div>
-
-      <hr>
-
-      <div class="row no-gutters pt-4">
-            <h2 class="size-24 color-gray-900 pb-2">{% t news.related %}</h2>
-      </div>
-
-        <div class="row no-gutters pb-4">
-            <div class="row justify-content-start">
-
-                  {% if page.url contains 'news' %}
-
-                      {% assign maxRelated = 3 %}
-                      {% assign minCommonTags =  1 %}
-                      {% assign maxRelatedCounter = 0 %}
-
-                      {% for news in site.news %}
-
-                      {% assign sameTagCount = 0 %}
-                      {% assign commonTags = '' %}
-
-                      {% for category in news.categories %}
-                        {% if news.url != page.url %}
-                          {% if page.categories contains category %}
-                            {% assign sameTagCount = sameTagCount | plus: 1 %}
-                            {% capture tagmarkup %} {% endcapture %}
-                            {% assign commonTags = commonTags | append: tagmarkup %}
-                          {% endif %}
-                        {% endif %}
-                      {% endfor %}
-
-                      {% if sameTagCount >= minCommonTags %}
-                        <div class="col-12 col-md-4 mb-3 d-flex">   
-                          <div class="highlight-card">
-                            <a class="stretched-link" href="{{ news.url | replace: '.html', ''  }}"></a>
-                            <img class="mb-3" src="{{ site.baseurl_root }}/assets/images/posts/{{ news.image }}" alt="{{ news.title }}" />
-                            <h3 class="size-24 color-gray-900 weight-700">{{ news.title }}</h3>
-                            {% if news.excerpt %}
-                              {% assign excerpt = news.excerpt %}
-                            {% else %}
-                              {% assign excerpt = news.content %}
-                            {% endif %}
-                            <p class="size-14 color-gray-900 mb-3">{{ excerpt | strip_html | truncatewords: 15 }}</p>
-                            <div class="bottom">
-                              <span class="size-12 color-gray-900 weight-700 mb-0">
-                                {% capture category %}{{ news.category }}{% endcapture %}
-                                {% t news.filters.{{ category }} %}
-                              </span>
-                            </div>
-                            <div class="bottom right">
-                              <span class="size-12 color-gray-900 weight-700 mb-0">
-                                {% capture month %}{{ news.date | date: "%b" }}{% endcapture %}
-                                {% t month.{{ month }} %} {{ news.date | date: "%-d, %Y"}}
-                              </span>
-                            </div>
-                          </div>
-                        </div>
-                        {% assign maxRelatedCounter = maxRelatedCounter | plus: 1 %}
-                        {% if maxRelatedCounter >= maxRelated %}
-                          {% break %}
-                        {% endif %}
-                      {% endif %}
-
-                  {% endfor %}
-
-                  {% else %}
-
-                  {% endif %}
-
-            </div>
-        </div>
-
     </div>
   </div>
 </div>
diff --git a/documentation-redirect.md b/documentation-redirect.md
@@ -3,4 +3,5 @@ layout: redirect
 sitemap: false
 permalink: /documentation/
 redirect_to:  /documentation
+title: generic.redirect.title
 ---
diff --git a/privacy-redirect.md b/privacy-redirect.md
@@ -3,4 +3,5 @@ layout: redirect
 sitemap: false
 permalink: /privacy/
 redirect_to:  /privacy
+title: generic.redirect.title
 ---
