From 50e92f74dbac007c5656f9eef2a34be4f428dd08 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 26 Aug 2021 11:16:17 +0200
Subject: Explicitly format devaway dates in ISO 8601-ish
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/710688
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 _plugins/devaway.rb                                  | 10 ++++++----
 inside-gentoo/developers/index.html                  |  2 +-
 inside-gentoo/developers/unavailable-developers.html |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/_plugins/devaway.rb b/_plugins/devaway.rb
index b7ebec7..0cd8990 100644
--- a/_plugins/devaway.rb
+++ b/_plugins/devaway.rb
@@ -4,7 +4,7 @@ module Gentoo
   class DevawayGenerator < Jekyll::Generator
     DEVAWAY_XML = '_data/devaway.xml'
     # ... @ yyyy/mm/dd HH:MMZ
-    DATE_REGEXP = /@ (\d+)\/(\d+)\/(\d+) (\d+):(\d)+Z$/
+    DATE_REGEXP = /@ (\d+)\/(\d+)\/(\d+) (\d+):(\d+)Z$/
 
     def generate(site)
       data = Nokogiri::XML(File.open(DEVAWAY_XML))
@@ -14,12 +14,14 @@ module Gentoo
 
       data.xpath('/devaway/dev').each do |dev|
         reason = dev.xpath('./reason/text()').first.content
-        date = Time.utc(*(DATE_REGEXP.match(reason).captures.map(&:to_i)))
+        date_match = DATE_REGEXP.match(reason)
+        reason = date_match.pre_match.rstrip()
+        date = Time.utc(*(date_match.captures.map(&:to_i)))
         away_sec = now - date
 
         site.data['devaway'][dev['nick']] = {
-          'reason' => dev.xpath('./reason/text()').first.content,
-          'date' =>  date,
+          'reason' => reason,
+          'date' => date,
           'away_days' => away_sec / 24 / 3600,
         }
       end
diff --git a/inside-gentoo/developers/index.html b/inside-gentoo/developers/index.html
index 26ec031..cd2095d 100644
--- a/inside-gentoo/developers/index.html
+++ b/inside-gentoo/developers/index.html
@@ -53,7 +53,7 @@ layout: page-nav3
         <a href="https://gitweb.gentoo.org/repo/gentoo.git/log/?qt=committer&q={{ devname }}@gentoo.org" title="Developer has repo/gentoo.git commit access"><sup class="text-success">[g]</sup></a>
       {% endif %}
       {% if site.data.devaway[devname] %}
-        <a href="unavailable-developers.html#{{ devname }}" title="{{ site.data.devaway[devname].reason }}"><sup class="text-danger">[a]</sup></a>
+        <a href="unavailable-developers.html#{{ devname }}" title="{{ site.data.devaway[devname].reason }} @ {{ site.data.devaway[devname].date | date:"%F %RZ" }}"><sup class="text-danger">[a]</sup></a>
       {% endif %}
       <br />
       {{ entry[1].name  | xml_escape }}
diff --git a/inside-gentoo/developers/unavailable-developers.html b/inside-gentoo/developers/unavailable-developers.html
index 2529921..bb6eea9 100644
--- a/inside-gentoo/developers/unavailable-developers.html
+++ b/inside-gentoo/developers/unavailable-developers.html
@@ -43,7 +43,7 @@ layout: page-nav3
         text-danger
       {% endif %}">
     <th id="{{ entry[0] | strip_html }}">{{ entry[0] | strip_html }}</th>
-    <td>{{ entry[1].reason | strip_html }}</td>
+    <td>{{ entry[1].reason | strip_html }} @ {{ entry[1].date | date:"%F %RZ" }}</td>
     </tr>
   {% endfor %}
 </table>
-- 
cgit v1.2.3-65-gdbad