Merge pull #1193: Upgrade to Jekyll 3.x

en/alerts.html

@@ -7,6 +7,7 @@ lang: en
 id: alerts
 title: Network status and alerts - Bitcoin
 ---
+{% assign date_sorted_alerts = site.alerts | sort: 'date' %}
 <link rel="alternate" type="application/rss+xml" href="/en/rss/alerts.rss" title="Bitcoin network status and alerts">
 
 
@@ -20,19 +21,19 @@ title: Network status and alerts - Bitcoin
   {% else %}
   <div class="alertstatusactive">The following network event is ongoing.</div>
   <ul class="alertsactive">
-  {% filter_for p in site.pages reversed sort_by:date category:alert %}{% if p.active == true %}
+  {% for p in date_sorted_alerts reversed %}{% if p.active == true %}
     <li>
       {{ p.date | date:"%Y-%m-%d" }} - <a href="{{ p.url | replace:'.html','' }}">{{ p.title }}</a>
     </li>
-  {% endif %}{% endfilter_for %}
+  {% endif %}{% endfor %}
   </ul>
   {% endif %}
   <ul class="alertsinactive">
-  {% filter_for p in site.pages reversed sort_by:date category:alert %}{% if p.active == false %}
+  {% for p in date_sorted_alerts reversed %}{% if p.active == false %}
     <li>
       {{ p.date | date:"%Y-%m-%d" }} - <a href="{{ p.url | replace:'.html','' }}">{{ p.title }}</a>
     </li>
-  {% endif %}{% endfilter_for %}
+  {% endif %}{% endfor %}
   </ul>
   <p><a href="http://getaddr.bitnodes.io/">Status and distribution of Bitcoin nodes</a></p>
   <p><a href="http://bitcoinstats.com/network/propagation/">Propagation time on the network</a></p>

en/bitcoin-core/index.md

@@ -11,6 +11,7 @@ breadcrumbs:
   - bitcoin
   - Bitcoin Core
 ---
+{% assign date_sorted_releases = site.releases | sort: 'optional_date', 'last' %}
 <link rel="alternate" type="application/rss+xml" href="/en/rss/releases.rss" title="Bitcoin Core releases">
 
 # Bitcoin Core
@@ -85,9 +86,9 @@ breadcrumbs:
 
 {% comment %}<!-- Capture all the releases into a string and convert it to an array -->{% endcomment %}
 {% capture text_releases %}
- {% filter_for p in site.pages reversed sort_by:versionint category:release %}
+{% for p in date_sorted_releases reversed %}
   {% if p.optional_date %}{{ p.optional_date | date:"%Y-%m-%d" }} - {% endif %}<a href="{{ p.url | replace:'.html','' }}">{{ p.title }}</a>::
- {% endfilter_for %}
+ {% endfor %}
 {% endcapture %}
 {% assign array_releases = text_releases | strip_newlines | split: '::' %}
 

en/rss/alerts.rss

@@ -15,13 +15,14 @@ lang: en
 		<url>https://bitcoin.org/img/icons/logo_rss.png</url>
 		<link>https://bitcoin.org/en/alerts</link>
 	</image>
-	{% filter_for p in site.pages reversed sort_by:date category:alert %}
+        {% assign date_sorted_alerts = site.alerts | sort: 'date' %}
+	{% for p in date_sorted_alerts reversed %}
         <item>
             <title>{{ p.title | htmlescape }}</title>
-            <link>https://bitcoin.org{{ p.url | replace:'.html','' }}</link>
-            <guid>https://bitcoin.org{{ p.url | replace:'.html','' }}</guid>
+            <link>https://bitcoin.org{{ p.url }}</link>
+            <guid>https://bitcoin.org{{ p.url }}</guid>
             <pubDate>{{ p.date | date: "%a, %d %b %Y" }} 00:00:00 GMT</pubDate>
         </item>
-	{% endfilter_for %}
+	{% endfor %}
 </channel>
 </rss>

en/rss/events.rss

@@ -16,13 +16,14 @@ lang: en
 		<url>https://bitcoin.org/img/icons/logo_rss.png</url>
 		<link>https://bitcoin.org/en/events</link>
 	</image>
-	{% filter_for p in site.conferences sort_by:date %}
+        {% assign date_sorted_conferences = site.conferences | sort: 'date' %}
+	{% for p in date_sorted_conferences %}
         <item>
             <title>{{ p.title | htmlescape }}, {{ p.city | htmlescape }} - {{ p.country | htmlescape }}</title>
-            <link>{{ p.link }}</link>
-            <guid>{{ p.link }}</guid>
+            <link>{{p.link}}</link>
+            <guid>{{p.link}}</guid>
             <pubDate>{{ p.date | date: "%a, %d %b %Y" }} 00:00:00 GMT</pubDate>
         </item>
-	{% endfilter_for %}
+	{% endfor %}
 </channel>
 </rss>

en/rss/releases.rss

@@ -15,11 +15,12 @@ lang: en
 		<url>https://bitcoin.org/img/icons/logo_rss.png</url>
 		<link>https://bitcoin.org/en/version-history</link>
 	</image>
-	{% filter_for p in site.pages reversed sort_by:versionint category:release %}
+        {% assign date_sorted_releases = site.releases | sort: 'optional_date', 'last' %}
+	{% for p in date_sorted_releases reversed %}
         <item>
-            <title>{{ p.title | htmlescape }}</title>
-            <link>https://bitcoin.org{{ p.url | replace:'.html','' }}</link>
-            <guid>https://bitcoin.org{{ p.url | replace:'.html','' }}</guid>
+            <title>{{ p.title | xmlescape }}</title>
+            <link>https://bitcoin.org{{ p.url }}</link>
+            <guid>https://bitcoin.org{{ p.url }}</guid>
           {% if p.optional_date %}
             <pubDate>{{ p.optional_date | date: "%a, %d %b %Y" }} 00:00:00 GMT</pubDate>
           {% else %}
@@ -27,6 +28,6 @@ lang: en
             {% warn "This release doesn't have optional_date set" %}
           {% endif %}
         </item>
-	{% endfilter_for %}
+	{% endfor %}
 </channel>
 </rss>

en/version-history.html

@@ -11,14 +11,15 @@ breadcrumbs:
   - bcc
   - News
 ---
+{% assign date_sorted_releases = site.releases | sort: 'optional_date', 'last' %}
 <link rel="alternate" type="application/rss+xml" href="/en/rss/releases.rss" title="Bitcoin Core releases">
 <div class="versiontext">
   <h1>Bitcoin Core version history<a type="application/rss+xml" href="/en/rss/releases.rss"><img src="/img/icons/icon_rss.svg" alt="rss" class="rssicon"></a></h1>
   <ul>
-  {% filter_for p in site.pages reversed sort_by:versionint category:release %}
+  {% for p in date_sorted_releases reversed %}
     <li>
       {% if p.optional_date %}{{ p.optional_date | date:"%Y-%m-%d" }} - {% endif %}<a href="{{ p.url | replace:'.html','' }}">{{ p.title }}</a>
     </li>
-  {% endfilter_for %}
+  {% endfor %}
   </ul>
 </div>