Skip to content

Commit 8852181

Browse files
committed
fix compilation errors
1 parent 552d0a3 commit 8852181

File tree

6 files changed

+22
-16
lines changed

6 files changed

+22
-16
lines changed

Sources/UnidocRender/Formats/Unidoc.RenderFormat.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extension Unidoc
1414
public
1515
var username:String?
1616
public
17-
var locale:ISO.Locale?
17+
var locale:ISO.Locale
1818
public
1919
let assets:Assets
2020
public
@@ -27,7 +27,7 @@ extension Unidoc
2727
init(
2828
security:ServerSecurity,
2929
username:String?,
30-
locale:ISO.Locale?,
30+
locale:ISO.Locale,
3131
assets:Assets,
3232
server:ServerType,
3333
time:UnixAttosecond = .now())

Sources/UnidocServer/Plugins/Unidoc.EventTime.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import HTML
22
import UnidocUI
33
import UnixCalendar
4+
import UnixTime
45

56
extension Unidoc
67
{

Sources/UnidocServer/Server/Unidoc.Server.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ extension Unidoc.Server
8787
.init(
8888
security: self.security,
8989
username: username,
90-
locale: locale,
90+
locale: locale ?? .init(language: .en),
9191
assets: self.options.cloudfront ? .cloudfront : .local,
9292
server: self.options.mode.server)
9393
}

Sources/UnidocUI/Endpoints/Packages/Unidoc.PackagesCrawledPage.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import BSON
22
import HTTP
33
import HTML
4+
import ISO
45
import UnidocRender
56
import UnidocDB
67
import UnidocQueries
@@ -96,19 +97,19 @@ extension Unidoc.PackagesCrawledPage:Unidoc.ApplicationPage
9697
{
9798
let id:Timestamp.Date = .init(year: year, month: month, day: day)
9899
let label:DateLabel
99-
switch (format.locale?.country, format.locale?.language)
100+
switch (format.locale.country, format.locale.language)
100101
{
101102
case (.as?, _),
102-
(.ca?, .en?),
103+
(.ca?, .en),
103104
(.fm?, _),
104105
(.gu?, _),
105-
(.ke?, .sw?),
106+
(.ke?, .sw),
106107
(.mh?, _),
107108
(.mp?, _),
108109
(.pa?, _),
109110
(.ph?, _),
110111
(.pr?, _),
111-
(.to?, .ee?),
112+
(.to?, .ee),
112113
(.us?, _),
113114
(.um?, _),
114115
(.vi?, _):
@@ -142,7 +143,7 @@ extension Unidoc.PackagesCrawledPage:Unidoc.ApplicationPage
142143
$0.title = """
143144
\(date.repos) Swift \
144145
\(date.repos == 1 ? "repository" : "repositories") \
145-
were created on GitHub on \(id.long(.en)).
146+
were created on GitHub on \(id.long(.init(language: .en))).
146147
"""
147148
}
148149
content:

Sources/UnidocUI/Endpoints/Packages/Unidoc.PackagesCreatedPage.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extension Unidoc.PackagesCreatedPage:Unidoc.ApplicationPage
4444
$0.href = "\(Unidoc.PackagesCreatedEndpoint[before])"
4545
} = ""
4646

47-
$0[.h1] = self.date.long(.en)
47+
$0[.h1] = self.date.long(format.locale)
4848

4949
$0[.a]
5050
{
@@ -57,7 +57,9 @@ extension Unidoc.PackagesCreatedPage:Unidoc.ApplicationPage
5757
{
5858
if self.groups.isEmpty
5959
{
60-
$0[.p] = "No Swift repositories were created on \(self.date.long(.en))."
60+
$0[.p] = """
61+
No Swift repositories were created on \(self.date.long(.init(language: .en))).
62+
"""
6163
}
6264
else
6365
{

Sources/UnidocUI/Endpoints/Tags/Unidoc.VersionsPage.swift

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ extension Unidoc.VersionsPage:Unidoc.ApplicationPage
102102
} = Unidoc.PackageMediaSettings.init(package: self.package)
103103
}
104104

105-
self.section(tags: &$0, now: format.time, dormancy: dormancy)
105+
self.section(tags: &$0, format: format, dormancy: dormancy)
106106
}
107107
}
108108
}
109109
extension Unidoc.VersionsPage
110110
{
111111
private
112-
func section(tags section:inout HTML.ContentEncoder, now:UnixAttosecond, dormancy:Duration?)
112+
func section(tags section:inout HTML.ContentEncoder,
113+
format:Unidoc.RenderFormat,
114+
dormancy:Duration?)
113115
{
114116
if let repo:Unidoc.PackageRepo = self.package.repo
115117
{
@@ -173,7 +175,7 @@ extension Unidoc.VersionsPage
173175
$0[.a]
174176
{
175177
$0.href = "\(Unidoc.PackagesCreatedEndpoint[created])"
176-
} = "\(created.month(.en)) \(created.day), \(created.year)"
178+
} = created.long(format.locale)
177179
}
178180
}
179181
}
@@ -289,15 +291,15 @@ extension Unidoc.VersionsPage
289291

290292
if let crawled:UnixMillisecond = self.package.repo?.crawled
291293
{
292-
let age:DurationFormat = .init(now - .init(crawled))
294+
let age:DurationFormat = .init(format.time - .init(crawled))
293295

294296
$0[.dt] = "Repo read"
295297
$0[.dd] = "\(age) ago"
296298
}
297299
if let repo:Unidoc.PackageRepo = self.package.repo,
298300
let fetched:UnixMillisecond = repo.fetched
299301
{
300-
let age:DurationFormat = .init(now - .init(fetched))
302+
let age:DurationFormat = .init(format.time - .init(fetched))
301303

302304
$0[.dt] = "Tags read"
303305
$0[.dd]
@@ -322,7 +324,7 @@ extension Unidoc.VersionsPage
322324
if self.view.editor,
323325
let expires:UnixMillisecond = self.package.repo?.expires
324326
{
325-
let dynamicInterval:DurationFormat = .init(.init(expires) - now)
327+
let dynamicInterval:DurationFormat = .init(.init(expires) - format.time)
326328

327329
$0[.dt] = "Tags fetch in"
328330
$0[.dd] = "\(dynamicInterval)"

0 commit comments

Comments
 (0)