From 3fe89192f632fd198e943261602a22a56fce999c Mon Sep 17 00:00:00 2001
From: javarome <javarome@gmail.com>
Date: Mon, 19 Aug 2024 01:58:28 +0200
Subject: [PATCH] docs

---
 build.ts                                      |    6 +-
 org/eu/fr/cnes/geipan/GeipanCaseSummary.ts    |    2 +-
 .../cnes/geipan/GeipanCaseSummaryRR0Mapper.ts |    5 +-
 org/eu/fr/cnes/geipan/GeipanHttpDatasource.ts |    2 +-
 ...n.36a0bf81ff285eb6cad31df608651a2f.en.html | 1528 -----------------
 .../crypto/ufo/enquete/dossier/CaseService.ts |    8 +-
 search/SearchCommand.ts                       |    4 +-
 ...egistry.ts => PersistentSourceRegistry.ts} |    7 +-
 source/SourceFactory.ts                       |   34 +-
 source/SourceRegistry.ts                      |    4 +-
 time/datasource/nuforc/NuforcCaseSummary.ts   |    4 +
 .../datasource/nuforc/NuforcHttpDatasource.ts |    6 +-
 time/datasource/nuforc/NuforcRR0Mapper.ts     |   18 +-
 time/datasource/ufo-search/UfoSearchCase.ts   |    4 +
 .../ufo-search/UfoSearchCaseRR0Mapper.ts      |    7 +-
 .../ufo-search/UfoSearchHttpDatasource.ts     |   12 +-
 time/datasource/urecat/UrecatDatasource.ts    |    9 +-
 time/datasource/urecat/UrecatRR0Mapper.ts     |    4 +
 18 files changed, 88 insertions(+), 1576 deletions(-)
 rename source/{PersisentSourceRegistry.ts => PersistentSourceRegistry.ts} (77%)

diff --git a/build.ts b/build.ts
index c08ca6e08b..b53929e9bf 100644
--- a/build.ts
+++ b/build.ts
@@ -72,7 +72,7 @@ import { ChronologyReplacerActions } from "./time/datasource/ChronologyReplacerA
 import { SourceReplacer } from "./source/SourceReplacer"
 import { NoteReplacer } from "./note/NoteReplacer"
 import { NoteFileCounter } from "./note/NoteFileCounter"
-import { PersisentSourceRegistry } from "./source/PersisentSourceRegistry"
+import { PersistentSourceRegistry } from "./source/PersistentSourceRegistry"
 import { SourceIndexStep } from "./source/SourceIndexStep"
 import { SourceFileCounter } from "./source/SourceFileCounter"
 import { TimeElementFactory } from "./time/TimeElementFactory"
@@ -236,7 +236,7 @@ timeService.getFiles().then(async (timeFiles) => {
   const sourceRegistryFileName = "source/index.json"
   const baseUrl = "https://rr0.org"
   const http = new HttpSource()
-  const sourceFactory = new PersisentSourceRegistry(dataService, http, baseUrl, sourceRegistryFileName)
+  const sourceFactory = new PersistentSourceRegistry(dataService, http, baseUrl, sourceRegistryFileName, timeFormat)
   const noteCounter = new NoteFileCounter()
   const noteRenderer = new NoteRenderer(noteCounter)
   const caseRenderer = new CaseSummaryRenderer(noteRenderer, sourceFactory, sourceRenderer)
@@ -264,7 +264,7 @@ timeService.getFiles().then(async (timeFiles) => {
     new SsiSetVarReplaceCommand("title", (_match: string, ...args: any[]) => `<title>${args[0]}</title>`),
     new SsiSetVarReplaceCommand("url",
       (_match: string, ...args: any[]) => `<meta name="url" content="${args[0]}"/>`),
-    new SsiLastModifiedReplaceCommand(context.time.options),
+    new SsiLastModifiedReplaceCommand(timeFormat),
     new SsiTitleReplaceCommand([timeDefaultHandler]),
     new DescriptionReplaceCommand("UFO data for french-reading people", "abstract"),
     new AuthorReplaceCommand(timeService)
diff --git a/org/eu/fr/cnes/geipan/GeipanCaseSummary.ts b/org/eu/fr/cnes/geipan/GeipanCaseSummary.ts
index f29edade82..3adac64e67 100644
--- a/org/eu/fr/cnes/geipan/GeipanCaseSummary.ts
+++ b/org/eu/fr/cnes/geipan/GeipanCaseSummary.ts
@@ -13,7 +13,7 @@ export type GeipanZoneCode = FranceDepartementCode | FranceRegionCode | CountryC
  */
 export interface GeipanCaseSummary {
   id: string
-  url: URL
+  url: string
   dateTime: TimeContext
   sightingType?: GeipanSightingType
   city: string
diff --git a/org/eu/fr/cnes/geipan/GeipanCaseSummaryRR0Mapper.ts b/org/eu/fr/cnes/geipan/GeipanCaseSummaryRR0Mapper.ts
index 7bfd4400b6..8ef51e6b56 100644
--- a/org/eu/fr/cnes/geipan/GeipanCaseSummaryRR0Mapper.ts
+++ b/org/eu/fr/cnes/geipan/GeipanCaseSummaryRR0Mapper.ts
@@ -43,11 +43,14 @@ export class GeipanCaseSummaryRR0Mapper implements CaseMapper<HtmlRR0SsgContext,
   map(context: HtmlRR0SsgContext, sourceCase: GeipanCaseSummary, sourceTime: Date): RR0CaseSummary {
     const id = sourceCase.id
     const caseSource: Source = {
-      url: sourceCase.url, title: "cas n° " + id, authors: this.authors,
+      previousSourceRefs: [],
+      events: [], url: sourceCase.url, title: "cas n° " + id, authors: this.authors,
       publication: {publisher: this.copyright, time: TimeContext.fromDate(sourceTime, context.time.options)}
     }
     const place = this.getPlace(context, sourceCase)
     return {
+      type: "case",
+      events: [],
       id,
       time: sourceCase.dateTime,
       place,
diff --git a/org/eu/fr/cnes/geipan/GeipanHttpDatasource.ts b/org/eu/fr/cnes/geipan/GeipanHttpDatasource.ts
index 46f663ee09..7e533bc723 100644
--- a/org/eu/fr/cnes/geipan/GeipanHttpDatasource.ts
+++ b/org/eu/fr/cnes/geipan/GeipanHttpDatasource.ts
@@ -127,7 +127,7 @@ export class GeipanHttpDatasource extends GeipanDatasource {
     return {
       zoneCode,
       id: caseNumber,
-      url,
+      url: url.href,
       city,
       dateTime,
       postTime,
diff --git a/people/b/BushmanBoyd/Area 51 Insider Leaks Dubious Alien UFO Evidence_files/follow_button.36a0bf81ff285eb6cad31df608651a2f.en.html b/people/b/BushmanBoyd/Area 51 Insider Leaks Dubious Alien UFO Evidence_files/follow_button.36a0bf81ff285eb6cad31df608651a2f.en.html
index 00774d21fb..0cb6f60b1c 100644
--- a/people/b/BushmanBoyd/Area 51 Insider Leaks Dubious Alien UFO Evidence_files/follow_button.36a0bf81ff285eb6cad31df608651a2f.en.html	
+++ b/people/b/BushmanBoyd/Area 51 Insider Leaks Dubious Alien UFO Evidence_files/follow_button.36a0bf81ff285eb6cad31df608651a2f.en.html	
@@ -397,1533 +397,5 @@
     <menuitem id="m-tweet" label="Send Tweet to user"></menuitem>
   </menu>
 </div>
-<script type="text/javascript">window.__twttr = window.__twttr || {}
-var i18n = {}
-window._ = function (s, reps) {
-  s = __twttr.lang && i18n[__twttr.lang] && i18n[__twttr.lang][s] || s
-  if (!reps) return s
-  return s.replace(/\%\{([a-z0-9_]+)\}/gi, function (m, k) {
-    return reps[k] || m
-  })
-}</script>
-<script>!function () {
-  Function && Function.prototype && Function.prototype.bind && (/MSIE [678]/.test(navigator.userAgent) || !function t(e, n, r) {
-    function i(s, a) {
-      if (!n[s]) {
-        if (!e[s]) {
-          var u = "function" == typeof require && require
-          if (!a && u) return u(s, !0)
-          if (o) return o(s, !0)
-          var c = new Error("Cannot find module '" + s + "'")
-          throw c.code = "MODULE_NOT_FOUND", c
-        }
-        var f = n[s] = {exports: {}}
-        e[s][0].call(f.exports, function (t) {
-          var n = e[s][1][t]
-          return i(n ? n : t)
-        }, f, f.exports, t, e, n, r)
-      }
-      return n[s].exports
-    }
-
-    for (var o = "function" == typeof require && require, s = 0; s < r.length; s++) i(r[s])
-    return i
-  }({
-    1: [function (t, e, n) {
-      (function () {
-        "use strict"
-
-        function t(t) {
-          return "function" == typeof t || "object" == typeof t && null !== t
-        }
-
-        function n(t) {
-          return "function" == typeof t
-        }
-
-        function r(t) {
-          return "object" == typeof t && null !== t
-        }
-
-        function i() {
-        }
-
-        function o() {
-          return function () {
-            process.nextTick(c)
-          }
-        }
-
-        function s() {
-          var t = 0, e = new F(c), n = document.createTextNode("")
-          return e.observe(n, {characterData: !0}), function () {
-            n.data = t = ++t % 2
-          }
-        }
-
-        function a() {
-          var t = new MessageChannel
-          return t.port1.onmessage = c, function () {
-            t.port2.postMessage(0)
-          }
-        }
-
-        function u() {
-          return function () {
-            setTimeout(c, 1)
-          }
-        }
-
-        function c() {
-          for (var t = 0; U > t; t += 2) {
-            var e = q[t], n = q[t + 1]
-            e(n), q[t] = void 0, q[t + 1] = void 0
-          }
-          U = 0
-        }
-
-        function f() {
-        }
-
-        function l() {
-          return new TypeError("You cannot resolve a promise with itself")
-        }
-
-        function d() {
-          return new TypeError("A promises callback cannot return that same promise.")
-        }
-
-        function h(t) {
-          try {
-            return t.then
-          } catch (e) {
-            return J.error = e, J
-          }
-        }
-
-        function p(t, e, n, r) {
-          try {
-            t.call(e, n, r)
-          } catch (i) {
-            return i
-          }
-        }
-
-        function m(t, e, n) {
-          A(function (t) {
-            var r = !1, i = p(n, e, function (n) {
-              r || (r = !0, e !== n ? w(t, n) : _(t, n))
-            }, function (e) {
-              r || (r = !0, b(t, e))
-            }, "Settle: " + (t._label || " unknown promise"))
-            !r && i && (r = !0, b(t, i))
-          }, t)
-        }
-
-        function g(t, e) {
-          e._state === B ? _(t, e._result) : t._state === z ? b(t, e._result) : E(e, void 0, function (e) {
-            w(t, e)
-          }, function (e) {
-            b(t, e)
-          })
-        }
-
-        function v(t, e) {
-          if (e.constructor === t.constructor) g(t, e) else {
-            var r = h(e)
-            r === J ? b(t, J.error) : void 0 === r ? _(t, e) : n(r) ? m(t, e, r) : _(t, e)
-          }
-        }
-
-        function w(e, n) {
-          e === n ? b(e, l()) : t(n) ? v(e, n) : _(e, n)
-        }
-
-        function y(t) {
-          t._onerror && t._onerror(t._result), x(t)
-        }
-
-        function _(t, e) {
-          t._state === H && (t._result = e, t._state = B, 0 === t._subscribers.length || A(x, t))
-        }
-
-        function b(t, e) {
-          t._state === H && (t._state = z, t._result = e, A(y, t))
-        }
-
-        function E(t, e, n, r) {
-          var i = t._subscribers, o = i.length
-          t._onerror = null, i[o] = e, i[o + B] = n, i[o + z] = r, 0 === o && t._state && A(x, t)
-        }
-
-        function x(t) {
-          var e = t._subscribers, n = t._state
-          if (0 !== e.length) {
-            for (var r, i, o = t._result, s = 0; s < e.length; s += 3) r = e[s], i = e[s + n], r ? O(n, r, i, o) : i(o)
-            t._subscribers.length = 0
-          }
-        }
-
-        function T() {
-          this.error = null
-        }
-
-        function R(t, e) {
-          try {
-            return t(e)
-          } catch (n) {
-            return W.error = n, W
-          }
-        }
-
-        function O(t, e, r, i) {
-          var o, s, a, u, c = n(r)
-          if (c) {
-            if (o = R(r, i), o === W ? (u = !0, s = o.error, o = null) : a = !0, e === o) return void b(e, d())
-          } else o = i, a = !0
-          e._state !== H || (c && a ? w(e, o) : u ? b(e, s) : t === B ? _(e, o) : t === z && b(e, o))
-        }
-
-        function N(t, e) {
-          try {
-            e(function (e) {
-              w(t, e)
-            }, function (e) {
-              b(t, e)
-            })
-          } catch (n) {
-            b(t, n)
-          }
-        }
-
-        function C(t, e, n, r) {
-          this._instanceConstructor = t, this.promise = new t(f, r), this._abortOnReject = n, this._validateInput(e) ? (this._input = e, this.length = e.length, this._remaining = e.length, this._init(), 0 === this.length ? _(this.promise, this._result) : (this.length = this.length || 0, this._enumerate(), 0 === this._remaining && _(this.promise, this._result))) : b(this.promise, this._validationError())
-        }
-
-        function I() {
-          throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")
-        }
-
-        function P() {
-          throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")
-        }
-
-        function S(t) {
-          this._id = X++, this._state = void 0, this._result = void 0, this._subscribers = [], f !== t && (n(t) || I(), this instanceof S || P(), N(this, t))
-        }
-
-        var j
-        j = Array.isArray ? Array.isArray : function (t) {
-          return "[object Array]" === Object.prototype.toString.call(t)
-        }
-        var L, k = j, U = (Date.now || function () {
-            return (new Date).getTime()
-          }, Object.create || function (t) {
-            if (arguments.length > 1) throw new Error("Second argument not supported")
-            if ("object" != typeof t) throw new TypeError("Argument must be an object")
-            return i.prototype = t, new i
-          }, 0), A = function (t, e) {
-            q[U] = t, q[U + 1] = e, U += 2, 2 === U && L()
-          }, M = "undefined" != typeof window ? window : {}, F = M.MutationObserver || M.WebKitMutationObserver,
-          D = "undefined" != typeof Uint8ClampedArray && "undefined" != typeof importScripts && "undefined" != typeof MessageChannel,
-          q = new Array(1e3)
-        L = "undefined" != typeof process && "[object process]" === {}.toString.call(process) ? o() : F ? s() : D ? a() : u()
-        var H = void 0, B = 1, z = 2, J = new T, W = new T
-        C.prototype._validateInput = function (t) {
-          return k(t)
-        }, C.prototype._validationError = function () {
-          return new Error("Array Methods must be provided an Array")
-        }, C.prototype._init = function () {
-          this._result = new Array(this.length)
-        }
-        var K = C
-        C.prototype._enumerate = function () {
-          for (var t = this.length, e = this.promise, n = this._input, r = 0; e._state === H && t > r; r++) this._eachEntry(n[r], r)
-        }, C.prototype._eachEntry = function (t, e) {
-          var n = this._instanceConstructor
-          r(t) ? t.constructor === n && t._state !== H ? (t._onerror = null, this._settledAt(t._state, e, t._result)) : this._willSettleAt(n.resolve(t), e) : (this._remaining--, this._result[e] = this._makeResult(B, e, t))
-        }, C.prototype._settledAt = function (t, e, n) {
-          var r = this.promise
-          r._state === H && (this._remaining--, this._abortOnReject && t === z ? b(r, n) : this._result[e] = this._makeResult(t, e, n)), 0 === this._remaining && _(r, this._result)
-        }, C.prototype._makeResult = function (t, e, n) {
-          return n
-        }, C.prototype._willSettleAt = function (t, e) {
-          var n = this
-          E(t, void 0, function (t) {
-            n._settledAt(B, e, t)
-          }, function (t) {
-            n._settledAt(z, e, t)
-          })
-        }
-        var V = function (t, e) {
-          return new K(this, t, !0, e).promise
-        }, $ = function (t, e) {
-          function n(t) {
-            w(o, t)
-          }
-
-          function r(t) {
-            b(o, t)
-          }
-
-          var i = this, o = new i(f, e)
-          if (!k(t)) return b(o, new TypeError("You must pass an array to race.")), o
-          for (var s = t.length, a = 0; o._state === H && s > a; a++) E(i.resolve(t[a]), void 0, n, r)
-          return o
-        }, Y = function (t, e) {
-          var n = this
-          if (t && "object" == typeof t && t.constructor === n) return t
-          var r = new n(f, e)
-          return w(r, t), r
-        }, G = function (t, e) {
-          var n = this, r = new n(f, e)
-          return b(r, t), r
-        }, X = 0, Q = S
-        S.all = V, S.race = $, S.resolve = Y, S.reject = G, S.prototype = {
-          constructor: S, then: function (t, e) {
-            var n = this, r = n._state
-            if (r === B && !t || r === z && !e) return this
-            var i = new this.constructor(f), o = n._result
-            if (r) {
-              var s = arguments[r - 1]
-              A(function () {
-                O(r, i, s, o)
-              })
-            } else E(n, i, t, e)
-            return i
-          }, "catch": function (t) {
-            return this.then(null, t)
-          }
-        }
-        var Z = function () {
-          var t
-          t = "undefined" != typeof global ? global : "undefined" != typeof window && window.document ? window : self
-          var e = "Promise" in t && "resolve" in t.Promise && "reject" in t.Promise && "all" in t.Promise && "race" in t.Promise && function () {
-            var e
-            return new t.Promise(function (t) {
-              e = t
-            }), n(e)
-          }()
-          e || (t.Promise = Q)
-        }, tt = {Promise: Q, polyfill: Z}
-        "function" == typeof define && define.amd ? define(function () {
-          return tt
-        }) : "undefined" != typeof e && e.exports ? e.exports = tt : "undefined" != typeof this && (this.ES6Promise = tt)
-      }).call(this)
-    }, {}], 2: [function (t, e, n) {
-      var r = t(3), i = t(36)
-      e.exports = function (t, e, n) {
-        var o, s, a, u, c = i.aug({}, n)
-        return arguments.length > 1 && "[object Object]" !== String(e) ? ((null === e || void 0 === e) && (c.expires = -1), "number" == typeof c.expires && (o = c.expires, s = new Date((new Date).getTime() + 60 * o * 1e3), c.expires = s), e = String(e), r.cookie = [encodeURIComponent(t), "=", c.raw ? e : encodeURIComponent(e), c.expires ? "; expires=" + c.expires.toUTCString() : "", c.path ? "; path=" + c.path : "", c.domain ? "; domain=" + c.domain : "", c.secure ? "; secure" : ""].join("")) : (c = e || {}, u = c.raw ? function (t) {
-          return t
-        } : decodeURIComponent, (a = new RegExp("(?:^|; )" + encodeURIComponent(t) + "=([^;]*)").exec(r.cookie)) ? u(a[1]) : null)
-      }
-    }, {3: 3, 36: 36}], 3: [function (t, e, n) {
-      e.exports = document
-    }, {}], 4: [function (t, e, n) {
-      e.exports = location
-    }, {}], 5: [function (t, e, n) {
-      e.exports = navigator
-    }, {}], 6: [function (t, e, n) {
-      e.exports = window
-    }, {}], 7: [function (t, e, n) {
-      function r(t) {
-        return a.isType("string", t) ? t.split(".") : a.isType("array", t) ? t : []
-      }
-
-      function i(t, e) {
-        var n = r(e), i = n.slice(0, -1)
-        return i.reduce(function (t, e, n) {
-          if (t[e] = t[e] || {}, !a.isObject(t[e])) throw new Error(i.slice(0, n + 1).join(".") + " is already defined with a value.")
-          return t[e]
-        }, t)
-      }
-
-      function o(t, e) {
-        e = e || s, e[t] = e[t] || {}, Object.defineProperty(this, "base", {value: e[t]}), Object.defineProperty(this, "name", {value: t})
-      }
-
-      var s = t(6), a = t(36)
-      a.aug(o.prototype, {
-        get: function (t) {
-          var e = r(t)
-          return e.reduce(function (t, e) {
-            return a.isObject(t) ? t[e] : void 0
-          }, this.base)
-        }, set: function (t, e, n) {
-          var o = r(t), s = i(this.base, t), a = o.slice(-1)
-          return n && a in s ? s[a] : s[a] = e
-        }, init: function (t, e) {
-          return this.set(t, e, !0)
-        }, unset: function (t) {
-          var e = r(t), n = this.get(e.slice(0, -1))
-          n && delete n[e.slice(-1)]
-        }, aug: function (t) {
-          var e = this.get(t), n = a.toRealArray(arguments).slice(1)
-          if (e = "undefined" != typeof e ? e : {}, n.unshift(e), !n.every(a.isObject)) throw new Error("Cannot augment non-object.")
-          return this.set(t, a.aug.apply(null, n))
-        }, call: function (t) {
-          var e = this.get(t), n = a.toRealArray(arguments).slice(1)
-          if (!a.isType("function", e)) throw new Error("Function " + t + "does not exist.")
-          return e.apply(null, n)
-        }, fullPath: function (t) {
-          var e = r(t)
-          return e.unshift(this.name), e.join(".")
-        }
-      }), e.exports = o
-    }, {36: 36, 6: 6}], 8: [function (t, e, n) {
-      function r(t) {
-        var e, n, r, i = 0
-        for (o = {}, t = t || s, e = t.getElementsByTagName("meta"); n = e[i]; i++) /^twitter:/.test(n.name) && (r = n.name.replace(/^twitter:/, ""), o[r] = n.content)
-      }
-
-      function i(t) {
-        return o[t]
-      }
-
-      var o, s = t(3)
-      r(), e.exports = {init: r, val: i}
-    }, {3: 3}], 9: [function (t, e, n) {
-      var r = t(7)
-      e.exports = new r("__twttr")
-    }, {7: 7}], 10: [function (t, e, n) {
-      e.exports = ["hi", "zh-cn", "fr", "zh-tw", "msa", "fil", "fi", "sv", "pl", "ja", "ko", "de", "it", "pt", "es", "ru", "id", "tr", "da", "no", "nl", "hu", "fa", "ar", "ur", "he", "th", "cs", "uk", "vi", "ro", "bn"]
-    }, {}], 11: [function (t, e, n) {
-      function r(t) {
-        if (t && /^[\w_]{1,20}$/.test(t)) return t
-        throw new Error("Invalid screen name")
-      }
-
-      function i(t, e) {
-        t.className += " " + e
-      }
-
-      function o(t) {
-        return t && "false" === t.toLowerCase()
-      }
-
-      function s(t) {
-        return st.getElementById(t)
-      }
-
-      function a(t) {
-        return t = t || A.event, t && t.preventDefault ? t.preventDefault() : t.returnValue = !1, t && t.stopPropagation ? t.stopPropagation() : t.cancelBubble = !0, !1
-      }
-
-      function u(t) {
-        var e = R && R.name ? R.name + " (@" + ut + ")" : "@" + ut
-        return E ? void (C.title = _("View your profile on Twitter")) : t ? (i(O, "following"), void (C.title = _("You are following %{name} on Twitter", {name: e}))) : (O.className = O.className.replace(/ ?following/, ""), void (C.title = _("Follow %{name} on Twitter", {name: e})))
-      }
-
-      function c() {
-        return /following/.test(O.className)
-      }
-
-      function f(t, e) {
-        return e = e || {width: 550, height: 500}, D.connect({window: e, src: t})
-      }
-
-      function l(t) {
-        return {screen_name: ut, original_referer: Q, region: t, partner: ht, tw_p: Z}
-      }
-
-      function d() {
-        var t = f(Y.get() + "?" + M.encode(l()), { height: 520, width: 550 })
-        m(t, tt)
-      }
-
-      function h(t) {
-        var e = f(Y.get() + "?" + M.encode(l(t)))
-        m(e, t)
-      }
-
-      function p(t) {
-        var e = f(Y.get() + "?" + M.encode(l(t)))
-        m(e, t)
-      }
-
-      function m(t, e) {
-        q(t).expose({
-          trigger: function (t, n) {
-            "follow" === t ? u(!0) : "unfollow" === t && u(!1), z.withHub(function (r) {
-              n.region || (n.region = e), r.trigger(t, n, X.id)
-            })
-          }
-        })
-      }
-
-      function g() {
-        var t = "@" + ut
-        B.clientEvent({page: "button", section: "follow", action: "impression"}, {
-          language: X.lang,
-          message: [X.size, ft ? "withcount" : "nocount"].join(":") + ":",
-          widget_origin: Q
-        }, !1), st.title = _("Twitter Follow Button"), I.innerHTML = ct ? _("Follow %{screen_name}", { screen_name: "<b>" + t + "</b>" }) : _("Follow"), ct && !X._ && O.offsetWidth < I.offsetWidth - 10 && (ct = !1, I.innerHTML = _("Follow")), u(!1), j.label = _("%{name} on Twitter", { name: t }), S.label = _("Follow"), L.label = _("Tweet to %{name}", { name: t }), C.href = Y.get() + "?" + M.encode(l(et)), P.href = Y.get() + "?" + M.encode(l(it)), i(O, "ready"), i(O.parentNode, dt), ft || i(O, "ncount"), lt && i(O, lt), G(N)
-      }
-
-      function v() {
-        function t(t, e) {
-          return B.interaction(t, {}, !1), z.withHub(function (t) {
-            t.trigger("click", {region: e}, X.id)
-          }), !(t.altKey || t.shiftKey || t.metaKey) || t.shiftKey && t.metaKey ? (J.ios() || J.android() || b ? A.open(Y.get() + "/" + ut + "?" + M.encode(l())) : E || c() || t && t.metaKey && t.shiftKey ? h(e) : d(), a(t)) : void 0
-        }
-
-        function e(t, e) {
-          return B.interaction(t, {}, !1), z.withHub(function (t) {
-            t.trigger("click", {region: e}, X.id)
-          }), t.altKey || t.shiftKey || t.metaKey ? void 0 : (h(e), a(t))
-        }
-
-        C.onclick = function (e) {
-          return t(e || A.event, c() ? nt : tt)
-        }, S.onclick = function (e) {
-          return t(e || A.event, ot)
-        }, P.onclick = function (t) {
-          return e(t || A.event, rt)
-        }, j.onclick = function (t) {
-          return e(t || A.event, ot)
-        }, L.onclick = function () {
-          return p(ot)
-        }
-      }
-
-      function w() {
-        var t, e
-        H.isLoggedIn() ? e = M.url(Y.get(), {
-          screen_names: ut,
-          requester_id: H.getUserId(),
-          lang: dt,
-          callback: Y.fullPath("setFollowersCountAndFollowing")
-        }) : ft && (e = M.url(Y.get(), {
-          screen_names: ut,
-          lang: dt,
-          callback: Y.fullPath("setFollowersCountAndFollowing")
-        })), e && (t = st.createElement("script"), t.src = e, O.appendChild(t))
-      }
-
-      var y, b, E, x, T, R, O, N, C, I, P, S, j, L, k = t(3), U = t(4), A = t(6), M = t(30), F = t(27), D = t(42),
-        q = t(41), H = t(19), B = t(15), z = t(37), J = t(23), W = t(10), K = t(22), V = t(33), $ = t(36), Y = t(9),
-        G = t(18), X = F.combined(U), Q = X.original_redirect_referrer || k.referrer, Z = "followbutton", tt = "follow",
-        et = "follow_link", nt = "following", rt = "count", it = "count_link", ot = "context_menu", st = k,
-        at = "true" == X.preview ? !0 : !1, ut = r(X.screen_name), ct = !o(X.show_screen_name), ft = !o(X.show_count),
-        lt = $.contains(["left", "right"], X.align) ? X.align : null, dt = X.lang && X.lang.toLowerCase(),
-        ht = X.partner
-      V.asBoolean(X.dnt) && K.setOn(), H.forwardSSL(Q) || (Y.aug("config", {
-        cdnFollowersInfoURL: "https://cdn.syndication.twimg.com/widgets/followbutton/info.json",
-        followersInfoURL: "https://syndication.twitter.com/widgets/followbutton/info.json",
-        userIntentURL: "https://twitter.com/intent/user",
-        followURL: "https://twitter.com/intent/follow",
-        mentionIntentURL: "https://twitter.com/intent/tweet",
-        twitterHost: "https://twitter.com"
-      }), O = st.body, N = s("widget"), C = s("follow-button"), I = s("l"), P = s("count"), S = s("m-follow"), j = s("m-profile"), L = s("m-tweet"), dt = $.contains(W, dt) ? dt : "en", Y.set("lang", dt), O.parentNode.lang = dt, T = _("ltr"), i(O, T), "l" == X.size && i(O, "xl"), Y.set("setFollowersCountAndFollowing", function (t) {
-        return t.error ? void u(!1) : void (t.length && (R = t[0], P.innerHTML = R.formatted_followers_count || "", i(O, "hcount count-ready"), y = R["protected"], b = R.age_gated, x = R.id, x !== H.getUserId() || at || (E = !0, u(!1)), u(R.following), G(N)))
-      }), g(), v(), w())
-    }, {
-      10: 10,
-      15: 15,
-      18: 18,
-      19: 19,
-      22: 22,
-      23: 23,
-      27: 27,
-      3: 3,
-      30: 30,
-      33: 33,
-      36: 36,
-      37: 37,
-      4: 4,
-      41: 41,
-      42: 42,
-      6: 6,
-      9: 9
-    }], 12: [function (t, e, n) {
-      function r(t) {
-        var e = []
-        return d.forIn(t, function (t, n) {
-          e.push(t + "=" + n)
-        }), e.join(",")
-      }
-
-      function i() {
-        return h + l.generate()
-      }
-
-      function o(t, e) {
-        function n(t) {
-          return Math.round(t / 2)
-        }
-
-        return t > e ? {coordinate: 0, size: e} : {coordinate: n(e) - n(t), size: t}
-      }
-
-      function s(t, e, n) {
-        var i, s
-        e = a.parse(), n = n || {}, i = o(e.width, n.width || p), e.left = i.coordinate, e.width = i.size, s = o(e.height, n.height || m), e.top = s.coordinate, e.height = s.size, this.win = t, this.features = r(e)
-      }
-
-      var a, u = t(6), c = t(26), f = t(32), l = t(34), d = t(36), h = "intent_", p = u.screen.width,
-        m = u.screen.height
-      a = (new c).defaults({
-        width: 550,
-        height: 520,
-        personalbar: "0",
-        toolbar: "0",
-        location: "1",
-        scrollbars: "1",
-        resizable: "1"
-      }), s.prototype.open = function (t) {
-        return f.isTwitterURL(t) ? (this.name = i(), this.popup = this.win.open(t, this.name, this.features), this) : void 0
-      }, s.open = function (t, e) {
-        var n = new s(u, e)
-        return n.open(t)
-      }, e.exports = s
-    }, {26: 26, 32: 32, 34: 34, 36: 36, 6: 6}], 13: [function (t, e, n) {
-      function r(t) {
-        if (!t) throw new Error("JsonRpcClient requires a dispatcher")
-        this.idIterator = 0, this.dispatcher = t, this.idPrefix = String(+new Date) + a++
-      }
-
-      function i(t) {
-        var e = {jsonrpc: s, method: t}
-        return arguments.length > 1 && (e.params = [].slice.call(arguments, 1)), e
-      }
-
-      var o = t(29), s = "2.0", a = 0
-      r.prototype._generateId = function () {
-        return this.idPrefix + this.idIterator++
-      }, r.prototype.notify = function () {
-        this.dispatcher.send(i.apply(null, arguments))
-      }, r.prototype.request = function () {
-        var t = i.apply(null, arguments)
-        return t.id = this._generateId(), this.dispatcher.send(t).then(function (t) {
-          return "result" in t ? t.result : o.reject(t.error)
-        })
-      }, e.exports = r
-    }, {29: 29}], 14: [function (t, e, n) {
-      function r(t, e, n) {
-        var r
-        t && t.postMessage && (m ? r = (n || "") + JSON.stringify(e) : n ? (r = {}, r[n] = e) : r = e, t.postMessage(r, "*"))
-      }
-
-      function i(t) {
-        return h.isType("string", t) ? t : "JSONRPC"
-      }
-
-      function o(t, e) {
-        return e ? h.isType("string", t) && 0 === t.indexOf(e) ? t.substring(e.length) : t[e] ? t[e] : void 0 : t
-      }
-
-      function s(t, e) {
-        var n = t.document
-        this.filter = i(e), this.server = null, this.isTwitterFrame = p.isTwitterURL(n.location.href), t.addEventListener("message", this._onMessage.bind(this), !1)
-      }
-
-      function a(t, e) {
-        this.pending = {}, this.target = t, this.isTwitterHost = p.isTwitterURL(c.href), this.filter = i(e), f.addEventListener("message", this._onMessage.bind(this), !1)
-      }
-
-      function u(t) {
-        return arguments.length > 0 && (m = !!t), m
-      }
-
-      var c = t(4), f = t(6), l = t(28), d = t(23), h = t(36), p = t(32), m = d.ie9()
-      h.aug(s.prototype, {
-        _onMessage: function (t) {
-          var e, n = this
-          this.server && (!this.isTwitterFrame || p.isTwitterURL(t.origin)) && (e = o(t.data, this.filter), e && this.server.receive(e, t.source).then(function (e) {
-            e && r(t.source, e, n.filter)
-          }))
-        }, attachTo: function (t) {
-          this.server = t
-        }, detach: function () {
-          this.server = null
-        }
-      }), h.aug(a.prototype, {
-        _processResponse: function (t) {
-          var e = this.pending[t.id]
-          e && (e.resolve(t), delete this.pending[t.id])
-        }, _onMessage: function (t) {
-          var e
-          if ((!this.isTwitterHost || p.isTwitterURL(t.origin)) && (e = o(t.data, this.filter))) {
-            if (h.isType("string", e)) try {
-              e = JSON.parse(e)
-            } catch (n) {
-              return
-            }
-            e = h.isType("array", e) ? e : [e], e.forEach(this._processResponse.bind(this))
-          }
-        }, send: function (t) {
-          var e = new l
-          return t.id ? this.pending[t.id] = e : e.resolve(), r(this.target, t, this.filter), e.promise
-        }
-      }), e.exports = {Receiver: s, Dispatcher: a, _stringifyPayload: u}
-    }, {23: 23, 28: 28, 32: 32, 36: 36, 4: 4, 6: 6}], 15: [function (t, e, n) {
-      function r(t, e, n) {
-        return i(t, e, n, 2)
-      }
-
-      function i(t, e, n, r) {
-        var i = !p.isObject(t), o = e ? !p.isObject(e) : !1
-        i || o || s(h.formatClientEventNamespace(t), h.formatClientEventData(e, n, r), h.CLIENT_EVENT_ENDPOINT)
-      }
-
-      function o(t, e, n, r) {
-        var o = h.extractTermsFromDOM(t.target || t.srcElement)
-        o.action = r || "click", i(o, e, n)
-      }
-
-      function s(t, e, n) {
-        var r, i
-        n && p.isObject(t) && p.isObject(e) && (r = h.flattenClientEventPayload(t, e), i = {l: h.stringify(r)}, r.dnt && (i.dnt = 1), f(d.url(n, i)))
-      }
-
-      function a(t, e, n, r) {
-        var i, o = !p.isObject(t), s = e ? !p.isObject(e) : !1
-        if (!o && !s) return i = h.flattenClientEventPayload(h.formatClientEventNamespace(t), h.formatClientEventData(e, n, r)), u(i)
-      }
-
-      function u(t) {
-        return g.push(t), g
-      }
-
-      function c() {
-        var t, e, n = d.url(h.CLIENT_EVENT_ENDPOINT, {dnt: 0, l: ""}), r = encodeURIComponent(n).length
-        return g.length > 1 && a({
-          page: "widgets_js",
-          component: "scribe_pixel",
-          action: "batch_log"
-        }, {}), t = g, g = [], e = t.reduce(function (e, n, i) {
-          var o, s, a = e.length, u = a && e[a - 1], c = i + 1 == t.length
-          return c && n.event_namespace && "batch_log" == n.event_namespace.action && (n.message = ["entries:" + i, "requests:" + a].join("/")), o = h.stringify(n), s = encodeURIComponent(o).length + 3, r + s > m ? e : ((!u || u.urlLength + s > m) && (u = {
-            urlLength: r,
-            items: []
-          }, e.push(u)), u.urlLength += s, u.items.push(o), e)
-        }, []), e.map(function (t) {
-          var e = { l: t.items }
-          return l.enabled() && (e.dnt = 1), f(d.url(h.CLIENT_EVENT_ENDPOINT, e))
-        })
-      }
-
-      function f(t) {
-        var e = new Image
-        return e.src = t
-      }
-
-      var l = t(22), d = t(30), h = t(16), p = t(36), m = 2083, g = []
-      e.exports = {
-        _enqueueRawObject: u,
-        scribe: s,
-        clientEvent: i,
-        clientEvent2: r,
-        enqueueClientEvent: a,
-        flushClientEvents: c,
-        interaction: o
-      }
-    }, {16: 16, 22: 22, 30: 30, 36: 36}], 16: [function (t, e, n) {
-      function r(t, e) {
-        var n
-        return e = e || {}, t && t.nodeType === Node.ELEMENT_NODE ? ((n = t.getAttribute("data-scribe")) && n.split(" ").forEach(function (t) {
-          var n = t.trim().split(":"), r = n[0], i = n[1]
-          r && i && !e[r] && (e[r] = i)
-        }), r(t.parentNode, e)) : e
-      }
-
-      function i(t) {
-        return l.aug({client: "tfw"}, t || {})
-      }
-
-      function o(t, e, n) {
-        var r = t && t.widget_origin || c.referrer
-        return t = s("tfw_client_event", t, r), t.client_version = p, t.format_version = void 0 !== n ? n : 1, e || (t.widget_origin = r), t
-      }
-
-      function s(t, e, n) {
-        return e = e || {}, l.aug({}, e, {_category_: t, triggered_on: e.triggered_on || +new Date, dnt: f.enabled(n)})
-      }
-
-      function a(t, e) {
-        return l.aug({}, e, {event_namespace: t})
-      }
-
-      function u(t) {
-        var e, n = Array.prototype.toJSON
-        return delete Array.prototype.toJSON, e = JSON.stringify(t), n && (Array.prototype.toJSON = n), e
-      }
-
-      var c = t(3), f = t(22), l = t(36), d = t(38), h = t(9), p = d.version,
-        m = h.get() || "https://syndication.twitter.com/i/jot",
-        g = h.get() || "https://syndication.twitter.com/i/jot/syndication",
-        v = h.get() || "https://platform.twitter.com/jot.html"
-      e.exports = {
-        extractTermsFromDOM: r,
-        flattenClientEventPayload: a,
-        formatGenericEventData: s,
-        formatClientEventData: o,
-        formatClientEventNamespace: i,
-        stringify: u,
-        AUDIENCE_ENDPOINT: g,
-        CLIENT_EVENT_ENDPOINT: m,
-        RUFOUS_REDIRECT: v
-      }
-    }, {22: 22, 3: 3, 36: 36, 38: 38, 9: 9}], 17: [function (t, e, n) {
-      function r() {
-        var t = 36e5, e = s.combined(o)._
-        return void 0 !== i ? i : (i = !1, e && /^\d+$/.test(e) && (i = +new Date - parseInt(e) < t), i)
-      }
-
-      var i, o = t(4), s = t(27)
-      e.exports = {isDynamicWidget: r}
-    }, {27: 27, 4: 4}], 18: [function (t, e, n) {
-      function r(t) {
-        var e = t.offsetWidth, n = t.offsetHeight
-        a.notify("twttr.private.resizeButton", {width: e, height: n})
-      }
-
-      var i = t(6), o = t(13), s = t(14), a = new o(new s.Dispatcher(i.parent, "twttr.resize"))
-      e.exports = r
-    }, {13: 13, 14: 14, 6: 6}], 19: [function (t, e, n) {
-      function r(t) {
-        var e = u("secure_session")
-        return "true" == e || "default" == e ? t ? "https:" === s.protocol : !0 : u("auth_token_session") ? !0 : !1
-      }
-
-      function i(t) {
-        return r() && "https:" !== s.protocol ? (a.onload = function () {
-          s.replace("https://" + s.host + s.pathname + s.search + s.hash + "&original_redirect_referrer=" + t)
-        }, !0) : void 0
-      }
-
-      function o() {
-        var t, e, n = u("twid")
-        return n && (t = n.split("|")[0]) ? (e = c.decode(t), e.c ? e.c : e.u) : void 0
-      }
-
-      var s = t(4), a = t(6), u = t(2), c = t(30)
-      e.exports = {isLoggedIn: r, forwardSSL: i, getUserId: o}
-    }, {2: 2, 30: 30, 4: 4, 6: 6}], 20: [function (t, e, n) {
-      function r(t) {
-        return t && u.isType("string", t) && (c = t), c
-      }
-
-      function i() {
-        return f
-      }
-
-      function o() {
-        return c !== f
-      }
-
-      var s = t(4), a = t(35), u = t(36), c = a.getCanonicalURL() || s.href, f = c
-      e.exports = {isFramed: o, rootDocumentLocation: r, currentDocumentLocation: i}
-    }, {35: 35, 36: 36, 4: 4}], 21: [function (t, e, n) {
-      function r() {
-        c = 1
-        for (var t = 0, e = f.length; e > t; t++) f[t]()
-      }
-
-      var i, o, s, a = t(3), u = t(6), c = 0, f = [], l = !1, d = a.createElement("a");
-      /^loade|c/.test(a.readyState) && (c = 1), a.addEventListener && a.addEventListener("DOMContentLoaded", o = function () {
-        a.removeEventListener("DOMContentLoaded", o, l), r()
-      }, l), d.doScroll && a.attachEvent("onreadystatechange", i = function () {
-        /^c/.test(a.readyState) && (a.detachEvent("onreadystatechange", i), r())
-      }), s = d.doScroll ? function (t) {
-        u.self != u.top ? c ? t() : f.push(t) : !function () {
-          try {
-            d.doScroll("left")
-          } catch (e) {
-            return setTimeout(function () {
-              s(t)
-            }, 50)
-          }
-          t()
-        }()
-      } : function (t) {
-        c ? t() : f.push(t)
-      }, e.exports = s
-    }, {3: 3, 6: 6}], 22: [function (t, e, n) {
-      function r() {
-        d = !0
-      }
-
-      function i(t, e) {
-        return d ? !0 : f.asBoolean(l.val("dnt")) ? !0 : !a || 1 != a.doNotTrack && 1 != a.msDoNotTrack ? c.isUrlSensitive(e || s.host) ? !0 : u.isFramed() && c.isUrlSensitive(u.rootDocumentLocation()) ? !0 : (t = h.test(t || o.referrer) && RegExp.$1, t && c.isUrlSensitive(t) ? !0 : !1) : !0
-      }
-
-      var o = t(3), s = t(4), a = t(5), u = t(20), c = t(31), f = t(33), l = t(8), d = !1, h = /https?:\/\/([^\/]+).*/i
-      e.exports = {setOn: r, enabled: i}
-    }, {20: 20, 3: 3, 31: 31, 33: 33, 4: 4, 5: 5, 8: 8}], 23: [function (t, e, n) {
-      function r(t) {
-        return t = t || g, t.devicePixelRatio ? t.devicePixelRatio >= 1.5 : t.matchMedia ? t.matchMedia("only screen and (min-resolution: 144dpi)").matches : !1
-      }
-
-      function i(t) {
-        return t = t || x, /(Trident|MSIE \d)/.test(t)
-      }
-
-      function o(t) {
-        return t = t || x, /MSIE 9/.test(t)
-      }
-
-      function s(t) {
-        return t = t || x, /(iPad|iPhone|iPod)/.test(t)
-      }
-
-      function a(t) {
-        return t = t || x, /^Mozilla\/5\.0 \(Linux; (U; )?Android/.test(t)
-      }
-
-      function u() {
-        return T
-      }
-
-      function c(t, e) {
-        return t = t || g, e = e || x, t.postMessage && !(i(e) && t.opener)
-      }
-
-      function f(t) {
-        t = t || m
-        try {
-          return !!t.plugins["Shockwave Flash"] || !!new ActiveXObject("ShockwaveFlash.ShockwaveFlash")
-        } catch (e) {
-          return !1
-        }
-      }
-
-      function l(t, e, n) {
-        return t = t || g, e = e || m, n = n || x, "ontouchstart" in t || /Opera Mini/.test(n) || e.msMaxTouchPoints > 0
-      }
-
-      function d() {
-        var t = p.body.style
-        return void 0 !== t.transition || void 0 !== t.webkitTransition || void 0 !== t.mozTransition || void 0 !== t.oTransition || void 0 !== t.msTransition
-      }
-
-      function h() {
-        return !!(g.Promise && g.Promise.resolve && g.Promise.reject && g.Promise.all && g.Promise.race && function () {
-          var t
-          return new g.Promise(function (e) {
-            t = e
-          }), _.isType("function", t)
-        }())
-      }
-
-      var p = t(3), m = t(5), g = t(6), v = t(21), w = t(25), y = t(33), _ = t(36), b = t(8), E = t(9), x = m.userAgent,
-        T = !1, R = !1, O = "twitter-csp-test"
-      E.set("verifyCSP", function (t) {
-        var e = p.getElementById(O)
-        R = !0, T = !!t, e && e.parentNode.removeChild(e)
-      }), v(function () {
-        var t
-        return y.asBoolean(b.val("widgets:csp")) ? T = !0 : (t = p.createElement("script"), t.id = O, t.text = E.fullPath("verifyCSP") + "(false);", p.body.appendChild(t), void g.setTimeout(function () {
-          R || (w.warn("TWITTER: Content Security Policy restrictions may be applied to your site. Add <meta name=\"twitter:widgets:csp\" content=\"on\"> to supress this warning."), w.warn("TWITTER: Please note: Not all embedded timeline and embedded Tweet functionality is supported when CSP is applied."))
-        }, 5e3))
-      }), e.exports = {
-        retina: r,
-        anyIE: i,
-        ie9: o,
-        ios: s,
-        android: a,
-        cspEnabled: u,
-        flashEnabled: f,
-        canPostMessage: c,
-        touch: l,
-        cssTransitions: d,
-        hasPromiseSupport: h
-      }
-    }, {21: 21, 25: 25, 3: 3, 33: 33, 36: 36, 5: 5, 6: 6, 8: 8, 9: 9}], 24: [function (t, e, n) {
-      var r = t(36), i = {
-        bind: function (t, e) {
-          return this._handlers = this._handlers || {}, this._handlers[t] = this._handlers[t] || [], this._handlers[t].push(e)
-        }, unbind: function (t, e) {
-          if (this._handlers[t]) if (e) {
-            var n = this._handlers[t].indexOf(e)
-            n >= 0 && this._handlers[t].splice(n, 1)
-          } else this._handlers[t] = []
-        }, trigger: function (t, e) {
-          var n = this._handlers && this._handlers[t]
-          e = e || {}, e.type = t, n && n.forEach(function (t) {
-            r.async(t.bind(this, e))
-          })
-        }
-      }
-      e.exports = {Emitter: i}
-    }, {36: 36}], 25: [function (t, e, n) {
-      function r() {
-        c("info", d.toRealArray(arguments))
-      }
-
-      function i() {
-        c("warn", d.toRealArray(arguments))
-      }
-
-      function o() {
-        c("error", d.toRealArray(arguments))
-      }
-
-      function s(t) {
-        m && (p[t] = u())
-      }
-
-      function a(t) {
-        var e
-        m && (p[t] ? (e = u(), r("_twitter", t, e - p[t])) : o("timeEnd() called before time() for id: ", t))
-      }
-
-      function u() {
-        return l.performance && +l.performance.now() || +new Date
-      }
-
-      function c(t, e) {
-        if (l[h] && l[h][t]) switch (e.length) {
-          case 1:
-            l[h][t](e[0])
-            break
-          case 2:
-            l[h][t](e[0], e[1])
-            break
-          case 3:
-            l[h][t](e[0], e[1], e[2])
-            break
-          case 4:
-            l[h][t](e[0], e[1], e[2], e[3])
-            break
-          case 5:
-            l[h][t](e[0], e[1], e[2], e[3], e[4])
-            break
-          default:
-            0 !== e.length && l[h].warn && l[h].warn("too many params passed to logger." + t)
-        }
-      }
-
-      var f = t(4), l = t(6), d = t(36), h = ["con", "sole"].join(""), p = {}, m = d.contains(f.href, "tw_debug=true")
-      e.exports = {info: r, warn: i, error: o, time: s, timeEnd: a}
-    }, {36: 36, 4: 4, 6: 6}], 26: [function (t, e, n) {
-      function r(t) {
-        return function (e) {
-          return o.hasValue(e[t])
-        }
-      }
-
-      function i() {
-        this.assertions = [], this._defaults = {}
-      }
-
-      var o = t(33), s = t(36)
-      i.prototype.assert = function (t, e) {
-        return this.assertions.push({fn: t, msg: e || "assertion failed"}), this
-      }, i.prototype.defaults = function (t) {
-        return this._defaults = t || this._defaults, this
-      }, i.prototype.require = function (t) {
-        var e = this
-        return t = Array.isArray(t) ? t : s.toRealArray(arguments), t.forEach(function (t) {
-          e.assert(r(t), "required: " + t)
-        }), this
-      }, i.prototype.parse = function (t) {
-        var e, n
-        if (e = s.aug({}, this._defaults, t || {}), n = this.assertions.reduce(function (t, n) {
-          return n.fn(e) || t.push(n.msg), t
-        }, []), n.length > 0) throw new Error(n.join("\n"))
-        return e
-      }, e.exports = i
-    }, {33: 33, 36: 36}], 27: [function (t, e, n) {
-      var r, i, o, s = t(30)
-      r = function (t) {
-        var e = t.search.substr(1)
-        return s.decode(e)
-      }, i = function (t) {
-        var e = t.href, n = e.indexOf("#"), r = 0 > n ? "" : e.substring(n + 1)
-        return s.decode(r)
-      }, o = function (t) {
-        var e, n = {}, o = r(t), s = i(t)
-        for (e in o) o.hasOwnProperty(e) && (n[e] = o[e])
-        for (e in s) s.hasOwnProperty(e) && (n[e] = s[e])
-        return n
-      }, e.exports = {combined: o, fromQuery: r, fromFragment: i}
-    }, {30: 30}], 28: [function (t, e, n) {
-      function r() {
-        var t = this
-        this.promise = new i(function (e, n) {
-          t.resolve = e, t.reject = n
-        })
-      }
-
-      var i = t(29)
-      e.exports = r
-    }, {29: 29}], 29: [function (t, e, n) {
-      var r = t(1).Promise, i = t(6), o = t(23)
-      e.exports = o.hasPromiseSupport() ? i.Promise : r
-    }, {1: 1, 23: 23, 6: 6}], 30: [function (t, e, n) {
-      function r(t) {
-        return encodeURIComponent(t).replace(/\+/g, "%2B").replace(/'/g, "%27")
-      }
-
-      function i(t) {
-        return decodeURIComponent(t)
-      }
-
-      function o(t) {
-        var e = []
-        return f.forIn(t, function (t, n) {
-          var i = r(t)
-          f.isType("array", n) || (n = [n]), n.forEach(function (t) {
-            c.hasValue(t) && e.push(i + "=" + r(t))
-          })
-        }), e.sort().join("&")
-      }
-
-      function s(t) {
-        var e, n = {}
-        return t ? (e = t.split("&"), e.forEach(function (t) {
-          var e = t.split("="), r = i(e[0]), o = i(e[1])
-          return 2 == e.length ? f.isType("array", n[r]) ? void n[r].push(o) : r in n ? (n[r] = [n[r]], void n[r].push(o)) : void (n[r] = o) : void 0
-        }), n) : {}
-      }
-
-      function a(t, e) {
-        var n = o(e)
-        return n.length > 0 ? f.contains(t, "?") ? t + "&" + o(e) : t + "?" + o(e) : t
-      }
-
-      function u(t) {
-        var e = t && t.split("?")
-        return 2 == e.length ? s(e[1]) : {}
-      }
-
-      var c = t(33), f = t(36)
-      e.exports = {url: a, decodeURL: u, decode: s, encode: o, encodePart: r, decodePart: i}
-    }, {33: 33, 36: 36}], 31: [function (t, e, n) {
-      function r(t) {
-        return t in a ? a[t] : a[t] = s.test(t)
-      }
-
-      function i() {
-        return r(o.host)
-      }
-
-      var o = t(4), s = /^[^#?]*\.(gov|mil)(:\d+)?([#?].*)?$/i, a = {}
-      e.exports = {isUrlSensitive: r, isHostPageSensitive: i}
-    }, {4: 4}], 32: [function (t, e, n) {
-      function r(t) {
-        return "string" == typeof t && m.test(t) && RegExp.$1.length <= 20
-      }
-
-      function i(t) {
-        return r(t) ? RegExp.$1 : void 0
-      }
-
-      function o(t, e) {
-        var n = p.decodeURL(t)
-        return e = e || !1, n.screen_name = i(t), n.screen_name ? p.url("https://twitter.com/intent/" + (e ? "follow" : "user"), n) : void 0
-      }
-
-      function s(t) {
-        return o(t, !0)
-      }
-
-      function a(t) {
-        return "string" == typeof t && y.test(t)
-      }
-
-      function u(t, e) {
-        return e = void 0 === e ? !0 : e, a(t) ? (e ? "#" : "") + RegExp.$1 : void 0
-      }
-
-      function c(t) {
-        return "string" == typeof t && g.test(t)
-      }
-
-      function f(t) {
-        return c(t) && RegExp.$1
-      }
-
-      function l(t) {
-        return v.test(t)
-      }
-
-      function d(t) {
-        return w.test(t)
-      }
-
-      function h(t) {
-        return _.test(t)
-      }
-
-      var p = t(30),
-        m = /(?:^|(?:https?\:)?\/\/(?:www\.)?twitter\.com(?:\:\d+)?(?:\/intent\/(?:follow|user)\/?\?screen_name=|(?:\/#!)?\/))@?([\w]+)(?:\?|&|$)/i,
-        g = /(?:^|(?:https?\:)?\/\/(?:www\.)?twitter\.com(?:\:\d+)?\/(?:#!\/)?[\w_]+\/status(?:es)?\/)(\d+)/i,
-        v = /^http(s?):\/\/(\w+\.)*twitter\.com([\:\/]|$)/i, w = /^http(s?):\/\/pbs\.twimg\.com\//,
-        y = /^#?([^.,<>!\s\/#\-\(\)\'\"]+)$/, _ = /twitter\.com(\:\d{2,4})?\/intent\/(\w+)/
-      e.exports = {
-        isHashTag: a,
-        hashTag: u,
-        isScreenName: r,
-        screenName: i,
-        isStatus: c,
-        status: f,
-        intentForProfileURL: o,
-        intentForFollowURL: s,
-        isTwitterURL: l,
-        isTwimgURL: d,
-        isIntentURL: h,
-        regexen: {profile: m}
-      }
-    }, {30: 30}], 33: [function (t, e, n) {
-      function r(t) {
-        return void 0 !== t && null !== t && "" !== t
-      }
-
-      function i(t) {
-        return s(t) && t % 1 === 0
-      }
-
-      function o(t) {
-        return s(t) && !i(t)
-      }
-
-      function s(t) {
-        return r(t) && !isNaN(t)
-      }
-
-      function a(t) {
-        return r(t) && "array" == p.toType(t)
-      }
-
-      function u(t) {
-        return p.contains(g, t)
-      }
-
-      function c(t) {
-        return p.contains(m, t)
-      }
-
-      function f(t) {
-        return r(t) ? c(t) ? !0 : u(t) ? !1 : !!t : !1
-      }
-
-      function l(t) {
-        return s(t) ? t : void 0
-      }
-
-      function d(t) {
-        return o(t) ? t : void 0
-      }
-
-      function h(t) {
-        return i(t) ? t : void 0
-      }
-
-      var p = t(36), m = [!0, 1, "1", "on", "ON", "true", "TRUE", "yes", "YES"],
-        g = [!1, 0, "0", "off", "OFF", "false", "FALSE", "no", "NO"]
-      e.exports = {
-        hasValue: r,
-        isInt: i,
-        isFloat: o,
-        isNumber: s,
-        isArray: a,
-        isTruthValue: c,
-        isFalseValue: u,
-        asInt: h,
-        asFloat: d,
-        asNumber: l,
-        asBoolean: f
-      }
-    }, {36: 36}], 34: [function (t, e, n) {
-      function r() {
-        return String(+new Date) + Math.floor(1e5 * Math.random()) + i++
-      }
-
-      var i = 0
-      e.exports = {generate: r}
-    }, {}], 35: [function (t, e, n) {
-      function r(t, e) {
-        var n, r
-        return e = e || a, /^https?:\/\//.test(t) ? t : /^\/\//.test(t) ? e.protocol + t : (n = e.host + (e.port.length ? ":" + e.port : ""), 0 !== t.indexOf("/") && (r = e.pathname.split("/"), r.pop(), r.push(t), t = "/" + r.join("/")), [e.protocol, "//", n, t].join(""))
-      }
-
-      function i() {
-        for (var t, e = s.getElementsByTagName("link"), n = 0; t = e[n]; n++) if ("canonical" == t.rel) return r(t.href)
-      }
-
-      function o() {
-        for (var t, e, n, r = s.getElementsByTagName("a"), i = s.getElementsByTagName("link"), o = [r, i], a = 0, c = 0, f = /\bme\b/; t = o[a]; a++) for (c = 0; e = t[c]; c++) if (f.test(e.rel) && (n = u.screenName(e.href))) return n
-      }
-
-      var s = t(3), a = t(4), u = t(32)
-      e.exports = {absolutize: r, getCanonicalURL: i, getScreenNameFromPage: o}
-    }, {3: 3, 32: 32, 4: 4}], 36: [function (t, e, n) {
-      function r(t) {
-        return l(arguments).slice(1).forEach(function (e) {
-          o(e, function (e, n) {
-            t[e] = n
-          })
-        }), t
-      }
-
-      function i(t) {
-        return o(t, function (e, n) {
-          u(n) && (i(n), c(n) && delete t[e]), (void 0 === n || null === n || "" === n) && delete t[e]
-        }), t
-      }
-
-      function o(t, e) {
-        for (var n in t) (!t.hasOwnProperty || t.hasOwnProperty(n)) && e(n, t[n])
-        return t
-      }
-
-      function s(t) {
-        return {}.toString.call(t).match(/\s([a-zA-Z]+)/)[1].toLowerCase()
-      }
-
-      function a(t, e) {
-        return t == s(e)
-      }
-
-      function u(t) {
-        return t === Object(t)
-      }
-
-      function c(t) {
-        if (!u(t)) return !1
-        if (Object.keys) return !Object.keys(t).length
-        for (var e in t) if (t.hasOwnProperty(e)) return !1
-        return !0
-      }
-
-      function f(t, e) {
-        h.setTimeout(function () {
-          t.call(e || null)
-        }, 0)
-      }
-
-      function l(t) {
-        return Array.prototype.slice.call(t)
-      }
-
-      function d(t, e) {
-        return t && t.indexOf ? t.indexOf(e) > -1 : !1
-      }
-
-      var h = t(6)
-      e.exports = {
-        aug: r,
-        async: f,
-        compact: i,
-        contains: d,
-        forIn: o,
-        isObject: u,
-        isEmptyObject: c,
-        toType: s,
-        isType: a,
-        toRealArray: l
-      }
-    }, {6: 6}], 37: [function (t, e, n) {
-      function r() {
-        if (o) return o
-        if (c.isDynamicWidget()) {
-          var t, e = 0, n = u.parent.frames.length
-          try {
-            if (o = u.parent.frames[d]) return o
-          } catch (r) {
-          }
-          if (f.anyIE()) for (; n > e; e++) try {
-            if (t = u.parent.frames[e], t && "function" == typeof t.openIntent) return o = t
-          } catch (r) {
-          }
-        }
-      }
-
-      function i() {
-        var t, e, n, o, a, f, l = {}
-        if ("function" === (typeof arguments[0]).toLowerCase() ? l.success = arguments[0] : l = arguments[0], t = l.success || function () {
-        }, e = l.timeout || function () {
-        }, n = l.nohub || function () {
-        }, o = l.complete || function () {
-        }, a = void 0 !== l.attempt ? l.attempt : m, !c.isDynamicWidget() || s) return n(), o(), !1
-        f = r(), a--
-        try {
-          if (f && f.trigger) return t(f), void o()
-        } catch (d) {
-        }
-        return 0 >= a ? (s = !0, e(), void o()) : +new Date - h > p * m ? (s = !0, void n()) : void u.setTimeout(function () {
-          i({success: t, timeout: e, nohub: n, attempt: a, complete: o})
-        }, p)
-      }
-
-      var o, s, a = t(4), u = t(6), c = t(17), f = t(23), l = "twttrHubFrameSecure",
-        d = "http:" == a.protocol ? "twttrHubFrame" : l, h = +new Date, p = 100, m = 20
-      e.exports = {withHub: i, contextualHubId: d, secureHubId: l}
-    }, {17: 17, 23: 23, 4: 4, 6: 6}], 38: [function (t, e, n) {
-      e.exports = {version: "6df2df2af40e4876413ef5749c1c4217bdf335a5:1436313965148"}
-    }, {}], 39: [function (t, e, n) {
-      function r() {
-      }
-
-      var i = t(36), o = t(24)
-      i.aug(r.prototype, o.Emitter, {
-        transportMethod: "", init: function () {
-        }, send: function (t) {
-          var e
-          this._ready ? this._performSend(t) : e = this.bind("ready", function () {
-            this.unbind("ready", e), this._performSend(t)
-          })
-        }, ready: function () {
-          this.trigger("ready", this), this._ready = !0
-        }, isReady: function () {
-          return !!this._ready
-        }, receive: function (t) {
-          this.trigger("message", t)
-        }
-      }), e.exports = {Connection: r}
-    }, {24: 24, 36: 36}], 40: [function (t, e, n) {
-      function r(t, e) {
-        var n = e || Math.floor(100 * Math.random()),
-          r = ["<object id=\"xdflashshim" + n + "\" name=\"xdflashshim" + n + "\"", "type=\"application/x-shockwave-flash\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\"", "width=\"1\" height=\"1\" style=\"position:absolute;left:-9999px;top:-9999px;\">", "<param name=\"movie\" value=\"" + t + "&debug=" + i.__XDDEBUG__ + "\">", "<param name=\"wmode\" value=\"window\">", "<param name=\"allowscriptaccess\" value=\"always\">", "</object>"].join(" ")
-        return r
-      }
-
-      var i = t(6)
-      e.exports = {object: r}
-    }, {6: 6}], 41: [function (t, e, n) {
-      function r(t) {
-        return (JSON.parse || JSON.decode)(t)
-      }
-
-      function i(t) {
-        this.con = t
-      }
-
-      function o() {
-        this.id = o.id++
-      }
-
-      var s = t(36), a = t(24)
-      s.aug(i.prototype, {
-        expose: function (t) {
-          this.con.bind("message", this._handleRequest(t))
-        }, call: function (t) {
-          var e, n = this
-          return this._requests || (this._requests = {}, this.con.bind("message", function (t) {
-            var e
-            try {
-              t = r(t)
-            } catch (i) {
-              return
-            }
-            t.callback && "number" == typeof t.id && (e = n._requests[t.id]) && (t.error ? e.trigger("error", t) : e.trigger("success", t), delete n._requests[t.id])
-          })), e = new o, this._requests[e.id] = e, e.send(this.con, t, Array.prototype.slice.call(arguments, 1))
-        }, _handleRequest: function (t) {
-          var e = this
-          return function (n) {
-            var i, o
-            try {
-              n = r(n)
-            } catch (s) {
-              return
-            }
-            n.callback || "number" == typeof n.id && "function" == typeof t[n.method] && (o = e._responseCallbacks(n.id), i = t[n.method].apply(t, n.params.concat(o)), "undefined" != typeof i && o[0](i))
-          }
-        }, _responseCallbacks: function (t) {
-          var e = this.con
-          return [function (n) {
-            e.send(JSON.stringify({id: t, result: n, callback: !0}))
-          }, function n(r) {
-            e.send(JSON.stringify({id: t, error: n, callback: r}))
-          }]
-        }
-      }), o.id = 0, s.aug(o.prototype, a.Emitter, {
-        send: function (t, e, n) {
-          return t.send(JSON.stringify({id: this.id, method: e, params: n})), this
-        }, success: function (t) {
-          return this.bind("success", t), this
-        }, error: function (t) {
-          return this.bind("error", t), this
-        }
-      }), e.exports = function (t) {
-        return new i(t)
-      }
-    }, {24: 24, 36: 36}], 42: [function (t, e, n) {
-      function r() {
-      }
-
-      function i(t) {
-        this.transportMethod = "PostMessage", this.options = t, this._createChild()
-      }
-
-      function o(t) {
-        this.transportMethod = "Flash", this.options = t, this.token = Math.random().toString(16).substring(2), this._setup()
-      }
-
-      function s(t) {
-        this.transportMethod = "Fallback", this.options = t, this._createChild()
-      }
-
-      var a, u = t(3), c = t(6), f = t(39), l = t(36), d = t(23), h = t(12), p = "__ready__", m = 0
-      r.prototype = new f.Connection, l.aug(r.prototype, {
-        _createChild: function () {
-          this.options.window ? this._createWindow() : this._createIframe()
-        }, _createIframe: function () {
-          function t() {
-            o.child = e.contentWindow, o._ready || o.init()
-          }
-
-          var e, n, r, i, o = this,
-            s = {allowTransparency: !0, frameBorder: "0", scrolling: "no", tabIndex: "0", name: this._name()},
-            f = l.aug(l.aug({}, s), this.options.iframe)
-          c.postMessage ? (a || (a = u.createElement("iframe")), e = a.cloneNode(!1)) : e = u.createElement("<iframe name=\"" + f.name + "\">"), e.id = f.name, l.forIn(f, function (t, n) {
-            "style" != t && e.setAttribute(t, n)
-          }), i = e.getAttribute("style"), i && "undefined" != typeof i.cssText ? i.cssText = f.style : e.style.cssText = f.style, e.addEventListener("load", t, !1), e.src = this._source(), (n = this.options.appendTo) ? n.appendChild(e) : (r = this.options.replace) ? (n = r.parentNode, n && n.replaceChild(e, r)) : u.body.insertBefore(e, u.body.firstChild)
-        }, _createWindow: function () {
-          var t = h.open(this._source()).popup
-          t && t.focus(), this.child = t, this.init()
-        }, _source: function () {
-          return this.options.src
-        }, _name: function () {
-          var t = "_xd_" + m++
-          return c.parent && c.parent != c && c.name && (t = c.name + t), t
-        }
-      }), i.prototype = new r, l.aug(i.prototype, {
-        init: function () {
-          function t(t) {
-            t.source === e.child && (e._ready || t.data !== p ? e.receive(t.data) : e.ready())
-          }
-
-          var e = this
-          c.addEventListener("message", t, !1)
-        }, _performSend: function (t) {
-          this.child.postMessage(t, this.options.src)
-        }
-      }), o.prototype = new r, l.aug(o.prototype, {
-        _setup: function () {
-          var e = this, n = t(40)
-          c["__xdcb" + e.token] = {
-            receive: function (t) {
-              e._ready || t !== p ? e.receive(t) : e.ready()
-            }, loaded: function () {
-            }
-          }
-          var r = u.createElement("div")
-          r.innerHTML = n.object("https://platform.twitter.com/xd/ft.swf?&token=" + e.token + "&parent=true&callback=__xdcb" + e.token + "&xdomain=" + e._host(), e.token), u.body.insertBefore(r, u.body.firstChild), e.proxy = r.firstChild, e._createChild()
-        }, init: function () {
-        }, _performSend: function (t) {
-          this.proxy.send(t)
-        }, _host: function () {
-          return this.options.src.replace(/https?:\/\//, "").split(/(:|\/)/)[0]
-        }, _source: function () {
-          return this.options.src + (this.options.src.match(/\?/) ? "&" : "?") + "xd_token=" + c.escape(this.token)
-        }
-      }), s.prototype = new r, l.aug(s.prototype, {
-        init: function () {
-        }, _performSend: function () {
-        }
-      }), e.exports = {
-        connect: function (t) {
-          return !d.canPostMessage() || d.anyIE() && t.window ? d.anyIE() && d.flashEnabled() ? new o(t) : new s(t) : new i(t)
-        }
-      }
-    }, {12: 12, 23: 23, 3: 3, 36: 36, 39: 39, 40: 40, 6: 6}]
-  }, {}, [11]))
-}()
-</script>
-<script src="info.json"></script>
 </body>
 </html>
diff --git a/science/crypto/ufo/enquete/dossier/CaseService.ts b/science/crypto/ufo/enquete/dossier/CaseService.ts
index a825c47d8a..9dafb63c05 100644
--- a/science/crypto/ufo/enquete/dossier/CaseService.ts
+++ b/science/crypto/ufo/enquete/dossier/CaseService.ts
@@ -32,13 +32,7 @@ export class CaseService {
     const caseContext = context.clone()
     if (time) {
       caseContext.time = time
-      const options = caseContext.time.options
-      options.year = "numeric"
-      options.month = undefined
-      options.day = undefined
-      options.hour = undefined
-      options.weekday = undefined
-      options.minute = undefined
+      const options: Intl.DateTimeFormatOptions = {year: "numeric"}
       const {result, replacement} = this.timeElementFactory.renderer.renderContent(caseContext, undefined, {url: true},
         options)
       result.append(replacement)
diff --git a/search/SearchCommand.ts b/search/SearchCommand.ts
index 0a26b8bb3b..85d5e4a8ea 100644
--- a/search/SearchCommand.ts
+++ b/search/SearchCommand.ts
@@ -67,8 +67,8 @@ export class SearchCommand implements ReplaceCommand<HtmlSsgContext> {
         context.warn(`Title "${title}" with URL ${url} is already indexed with URL ${titleIndexed.url}`)
       }
       const indexContext = context.clone()
-      indexContext.time.options.weekday = undefined
-      const time = this.timeTextBuilder.build(indexContext).toLowerCase()
+      const time = this.timeTextBuilder.build(indexContext, true,
+        {year: "numeric", month: "short", day: "numeric"}).toLowerCase()
       indexedPages.push({title, url, time})
     }
     if (this.config.indexWords) {
diff --git a/source/PersisentSourceRegistry.ts b/source/PersistentSourceRegistry.ts
similarity index 77%
rename from source/PersisentSourceRegistry.ts
rename to source/PersistentSourceRegistry.ts
index b383a01deb..cab24ac2a4 100644
--- a/source/PersisentSourceRegistry.ts
+++ b/source/PersistentSourceRegistry.ts
@@ -7,10 +7,11 @@ import { FileContents } from "ssg-api"
 /**
  * Create Source objects and register them.
  */
-export class PersisentSourceRegistry extends SourceRegistry {
+export class PersistentSourceRegistry extends SourceRegistry {
 
-  constructor(dataService: DataService, http: HttpSource, baseUrl: string, protected fileName: string) {
-    super(dataService, http, baseUrl)
+  constructor(dataService: DataService, http: HttpSource, baseUrl: string, protected fileName: string,
+              options: Intl.DateTimeFormatOptions) {
+    super(dataService, http, baseUrl, options)
     const registryFileContents = FileContents.read(fileName, "utf-8").contents
     this.registry = JSON.parse(registryFileContents)
   }
diff --git a/source/SourceFactory.ts b/source/SourceFactory.ts
index 1be30166fa..34a081bda3 100644
--- a/source/SourceFactory.ts
+++ b/source/SourceFactory.ts
@@ -12,7 +12,8 @@ import { HttpSource } from "../time/datasource/HttpSource"
  */
 export class SourceFactory {
 
-  constructor(protected dataService: DataService, protected http: HttpSource, protected baseUrl: string) {
+  constructor(protected dataService: DataService, protected http: HttpSource, protected baseUrl: string,
+              protected options: Intl.DateTimeFormatOptions) {
   }
 
   /**
@@ -54,15 +55,16 @@ export class SourceFactory {
         source = await this.fromPage(href, hash)
         break
       case ".json":
-        const sources = await this.dataService.getFromDir(path.dirname(href), sourceTypes, [path.basename(href)])
+        const sources = await this.dataService.getFromDir<Source>(path.dirname(href), sourceTypes,
+          [path.basename(href)])
         source = sources?.[0]
         break
       default: {
-        const sources = await this.dataService.getFromDir(ext ? path.dirname(href) : href, sourceTypes,
+        const sources = await this.dataService.getFromDir<Source>(ext ? path.dirname(href) : href, sourceTypes,
           ["index.json", "people.json"])
         source = sources?.[0]
         if (!source) {
-          source = this.fromPage(path.join(href, "index.html"), hash)
+          source = await this.fromPage(path.join(href, "index.html"), hash)
         }
       }
     }
@@ -97,9 +99,15 @@ export class SourceFactory {
       title = href
     }
     publisher = resOut.headers.get("host")
-    const time = lastModif ? TimeContext.fromDate(new Date(lastModif), context.time.options) : context.time
+    const time = lastModif ? TimeContext.fromDate(new Date(lastModif), this.options) : context.time
     const publication: Publication = {publisher, time}
-    return {title, url: href, publication}
+    return {
+      title,
+      url: href,
+      events: [],
+      previousSourceRefs: [],
+      publication
+    }
   }
 
   async fromPage(href: string, hash = ""): Promise<Source> {
@@ -118,11 +126,15 @@ export class SourceFactory {
     } else {
       title = doc.querySelector("title").textContent
     }
+    const publisher = doc.querySelector("meta[name='copyright']")?.getAttribute("content")
+    const authors = Array.from(doc.querySelectorAll("meta[name='author']")).map(meta => meta.getAttribute("content"))
     return {
-      title: title,
-      authors: Array.from(doc.querySelectorAll("meta[name='author']")).map(meta => meta.getAttribute("content")),
-      publication: {publisher: doc.querySelector("meta[name='copyright']")?.getAttribute("content")},
-      url
-    } as Source
+      title,
+      url: url.href,
+      events: [],
+      previousSourceRefs: [],
+      authors,
+      publication: {publisher, time: undefined}
+    }
   }
 }
diff --git a/source/SourceRegistry.ts b/source/SourceRegistry.ts
index eae28cb8bc..19f7fa21f1 100644
--- a/source/SourceRegistry.ts
+++ b/source/SourceRegistry.ts
@@ -11,8 +11,8 @@ export class SourceRegistry extends SourceFactory {
 
   protected registry = {}
 
-  constructor(dataService: DataService, http: HttpSource, baseUrl: string) {
-    super(dataService, http, baseUrl)
+  constructor(dataService: DataService, http: HttpSource, baseUrl: string, options: Intl.DateTimeFormatOptions) {
+    super(dataService, http, baseUrl, options)
   }
 
   /**
diff --git a/time/datasource/nuforc/NuforcCaseSummary.ts b/time/datasource/nuforc/NuforcCaseSummary.ts
index 74a26d3a8a..790a713329 100644
--- a/time/datasource/nuforc/NuforcCaseSummary.ts
+++ b/time/datasource/nuforc/NuforcCaseSummary.ts
@@ -1,8 +1,12 @@
 import { NuforcState } from "./NuforcState"
 import { NuforcCountry } from "./NuforcCountry"
 import { NuforcShape } from "./NuforcShape"
+import { TimeContext } from "../../TimeContext"
 
 export interface NuforcCaseSummary {
+  readonly id: string
+  readonly time: TimeContext
+  readonly url: string
   readonly city: string
   readonly state: NuforcState
   readonly country: NuforcCountry
diff --git a/time/datasource/nuforc/NuforcHttpDatasource.ts b/time/datasource/nuforc/NuforcHttpDatasource.ts
index ae1f2aade2..e6e82b7ad4 100644
--- a/time/datasource/nuforc/NuforcHttpDatasource.ts
+++ b/time/datasource/nuforc/NuforcHttpDatasource.ts
@@ -37,7 +37,7 @@ export class NuforcHttpDatasource extends NuforcDatasource {
 
   protected async readCases(context: RR0SsgContext): Promise<NuforcCaseSummary[]> {
     const searchUrl = this.queryUrl(context)
-    const doc = await this.http.get(searchUrl.href, {headers: {accept: "text/html;charset=utf-8"}})
+    const doc = await this.http.get(searchUrl, {headers: {accept: "text/html;charset=utf-8"}})
     const rowEls = doc.querySelectorAll("#table_1 tbody tr")
     return Array.from(rowEls).map(row => this.getNativeCase(context, row))
   }
@@ -90,7 +90,7 @@ export class NuforcHttpDatasource extends NuforcDatasource {
     const columns = row.querySelectorAll("td")
     const url = this.getLink(columns[0])
     const caseNumber = new URLSearchParams(url.search).get("id")
-    const dateTime = this.getTime(columns[1], context)
+    const time = this.getTime(columns[1], context)
     const city = columns[2].textContent
     const state = this.getState(columns[3])
     const country = this.getCountry(columns[4])
@@ -99,6 +99,6 @@ export class NuforcHttpDatasource extends NuforcDatasource {
     const reportDate = this.dateFromField(columns[7])
     const postDate = this.dateFromField(columns[8])
     const image = this.getImage(columns[9])
-    return {id: caseNumber, url, city, state, country, dateTime, shape, summary, reportDate, postDate, image}
+    return {id: caseNumber, url: url.href, city, state, country, time, shape, summary, reportDate, postDate, image}
   }
 }
diff --git a/time/datasource/nuforc/NuforcRR0Mapper.ts b/time/datasource/nuforc/NuforcRR0Mapper.ts
index 7319de364b..287ae29d49 100644
--- a/time/datasource/nuforc/NuforcRR0Mapper.ts
+++ b/time/datasource/nuforc/NuforcRR0Mapper.ts
@@ -24,6 +24,8 @@ import { southKorea } from "../../../org/kr/SouthKorea"
 import { uk } from "../../../org/uk/Uk"
 import { usa } from "../../../org/us/Usa"
 import { Source } from "../../../source/Source"
+import { algeria } from "../../../org/dz/Algeria"
+import { panama } from "../../../org/pa/Panama"
 
 export class NuforcRR0Mapper implements CaseMapper<HtmlRR0SsgContext, NuforcCaseSummary, RR0CaseSummary> {
 
@@ -64,26 +66,30 @@ export class NuforcRR0Mapper implements CaseMapper<HtmlRR0SsgContext, NuforcCase
   }
 
   static readonly countryMap: { [key in NuforcCountry]: string } = {
+    Algeria: algeria.id,
     Australia: australia.id,
     Brazil: brazil.id,
     Canada: canada.id,
     Colombia: colombia.id,
-    DominicanRepublic: dominicanRepublic.id,
+    "Dominican Republic": dominicanRepublic.id,
     Germany: germany.id,
     India: india.id,
+    Panama: panama.id,
     Peru: peru.id,
     Philippines: philippines.id,
     Mexico: mexico.id,
-    NewZealand: newZealand.id,
+    "New Zealand": newZealand.id,
     Seychelles: seychelles.id,
-    SouthKorea: southKorea.id,
-    UnitedKingdom: uk.id,
+    "South Korea": southKorea.id,
+    "United Kingdom": uk.id,
     Unspecified: "?",
     USA: usa.id
   }
 
   map(context: HtmlRR0SsgContext, sourceCase: NuforcCaseSummary, sourceTime: Date): RR0CaseSummary {
     const caseSource: Source = {
+      previousSourceRefs: [],
+      events: [],
       url: sourceCase.url,
       title: "cas n° " + sourceCase.id,
       authors: this.authors,
@@ -101,7 +107,9 @@ export class NuforcRR0Mapper implements CaseMapper<HtmlRR0SsgContext, NuforcCase
       `Could not find city of name "${placeName}" in state "${sourceCase.state}" of country "${countryCode}"`)
     const place: NamedPlace = {name: city.getTitle(context), place: city.places[0]}
     return {
-      time: sourceCase.dateTime,
+      type: "case",
+      events: [],
+      time: sourceCase.time,
       place,
       description: this.getDescription(sourceCase),
       sources: [caseSource]
diff --git a/time/datasource/ufo-search/UfoSearchCase.ts b/time/datasource/ufo-search/UfoSearchCase.ts
index 1a9be65b1d..56f6f91e42 100644
--- a/time/datasource/ufo-search/UfoSearchCase.ts
+++ b/time/datasource/ufo-search/UfoSearchCase.ts
@@ -1,3 +1,4 @@
+import { TimeContext } from "../../TimeContext"
 
 export enum UfoSearchCaseType {
   letter = "letter",
@@ -101,6 +102,9 @@ export type UfoSearchCaseKeyValues = {
 }
 
 export interface UfoSearchCase {
+  id: string
+  url: string
+  time: TimeContext
   location?: string
   desc: string,
   key_vals: UfoSearchCaseKeyValues,
diff --git a/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.ts b/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.ts
index bb1cae9a23..388db6cae4 100644
--- a/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.ts
+++ b/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.ts
@@ -20,12 +20,17 @@ export class UfoSearchCaseRR0Mapper implements CaseMapper<HtmlRR0SsgContext, Ufo
 
   map(context: HtmlRR0SsgContext, sourceCase: UfoSearchCase, sourceTime: Date): RR0CaseSummary {
     const caseSource: Source = {
+      events: [], previousSourceRefs: [],
       url: sourceCase.url, title: "cas n° " + sourceCase.id, authors: this.authors,
       publication: {publisher: this.copyright, time: TimeContext.fromDate(sourceTime, context.time.options)}
     }
     const place = this.getPlace(context, sourceCase)
     return {
-      time: sourceCase.dateTime,
+      id: sourceCase.id,
+      type: "case",
+      url: sourceCase.url,
+      events: [],
+      time: sourceCase.time,
       place,
       description: this.getDescription(sourceCase),
       sources: [caseSource]
diff --git a/time/datasource/ufo-search/UfoSearchHttpDatasource.ts b/time/datasource/ufo-search/UfoSearchHttpDatasource.ts
index ff68911f33..87398009e3 100644
--- a/time/datasource/ufo-search/UfoSearchHttpDatasource.ts
+++ b/time/datasource/ufo-search/UfoSearchHttpDatasource.ts
@@ -83,18 +83,18 @@ export class UfoSearchHttpDatasource extends UfoSearchDatasource {
     const fieldsHeadings = Array.from(row.querySelectorAll("strong"))
     const dateLabel = fieldsHeadings.find(heading => heading.textContent.indexOf("Date") >= 0)
     const itemContext = context.clone()
-    const dateTime = itemContext.time.reset()
+    const time = itemContext.time.reset()
     let url: URL
     let caseNumber
     if (dateLabel) {
       const dateLink = dateLabel.nextElementSibling as HTMLAnchorElement
       url = new URL(dateLink.href, this.baseUrl)
       caseNumber = url.hash.substring(1)
-      this.setDate(dateTime, dateLink.textContent)
+      this.setDate(time, dateLink.textContent)
     }
     const timeLabel = fieldsHeadings.find(heading => heading.textContent.indexOf("Time") >= 0)
     if (timeLabel) {
-      this.setTime(dateTime, timeLabel)
+      this.setTime(time, timeLabel)
     }
     const locationLabel = fieldsHeadings.find(heading => heading.textContent.indexOf("Location") >= 0)
     let location: string | undefined
@@ -114,7 +114,11 @@ export class UfoSearchHttpDatasource extends UfoSearchDatasource {
     let attributes
     let extraData
     return {
-      id: caseNumber, dateTime, location, desc: type,
+      id: caseNumber,
+      time,
+      url: url.href,
+      location,
+      desc: type,
       key_vals: {url},
       attributes,
       ref: "",
diff --git a/time/datasource/urecat/UrecatDatasource.ts b/time/datasource/urecat/UrecatDatasource.ts
index 6d798c5a7b..5d1f9f0e00 100644
--- a/time/datasource/urecat/UrecatDatasource.ts
+++ b/time/datasource/urecat/UrecatDatasource.ts
@@ -14,12 +14,13 @@ export abstract class UrecatDatasource implements Datasource<UrecatCase> {
   }
 
   async fetch(context: RR0SsgContext): Promise<UrecatCase[]> {
-    const day = context.time.getDayOfMonth()
-    const month = context.time.getMonth()
-    const year = context.time.getYear()
+    const time = context.time
+    const day = time.getDayOfMonth()
+    const month = time.getMonth()
+    const year = time.getYear()
     const summaries = await this.getSummaries(context)
     return summaries.filter(c => {
-      const sightingTime = c.dateTime
+      const sightingTime = c.time
       return (!year || year === sightingTime.getYear()) && (!month || month === sightingTime.getMonth()) && (!day || day === sightingTime.getDayOfMonth())
     })
   }
diff --git a/time/datasource/urecat/UrecatRR0Mapper.ts b/time/datasource/urecat/UrecatRR0Mapper.ts
index ef67d6a60e..857dd43682 100644
--- a/time/datasource/urecat/UrecatRR0Mapper.ts
+++ b/time/datasource/urecat/UrecatRR0Mapper.ts
@@ -23,6 +23,7 @@ export class UrecatRR0Mapper implements CaseMapper<HtmlRR0SsgContext, UrecatCase
 
   map(context: HtmlRR0SsgContext, sourceCase: UrecatCase, sourceTime: Date): RR0CaseSummary {
     const caseSource: Source = {
+      events: [], previousSourceRefs: [],
       url: sourceCase.url, title: "cas n° " + sourceCase.id, authors: this.authors,
       publication: {publisher: this.copyright, time: TimeContext.fromDate(sourceTime, context.time.options)}
     }
@@ -42,7 +43,10 @@ export class UrecatRR0Mapper implements CaseMapper<HtmlRR0SsgContext, UrecatCase
       `Could not find city of name "${placeName}" in state "${location.departmentOrState}" of country "${sourceCountry}"`)
     const place: NamedPlace = {name: city.getTitle(context), place: city.places[0]}
     return {
+      type: "case",
       id: sourceCase.id,
+      url: sourceCase.url,
+      events: [],
       time: sourceCase.basicInfo.base.sightingDate,
       place,
       description: this.getDescription(sourceCase),