Skip to content

Commit b486dfa

Browse files
committed
internal/middleware: delete Language and languageTag
The Language middleware isn't referenced anywhere else in the code, so the context tag can't be set anywhere and languageTag must always be returning English. Just hardcode English everywhere instead For golang/go#61399 Change-Id: Id8cee6b9fb87a7f8f3460fb6eaf2f14ea0af7c8d Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/514675 Run-TryBot: Michael Matloob <[email protected]> TryBot-Result: Gopher Robot <[email protected]> kokoro-CI: kokoro <[email protected]> Reviewed-by: Jamal Carvalho <[email protected]>
1 parent 9e6bdc9 commit b486dfa

File tree

4 files changed

+6
-40
lines changed

4 files changed

+6
-40
lines changed

internal/frontend/imports.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"golang.org/x/pkgsite/internal"
1212
"golang.org/x/pkgsite/internal/log"
13-
"golang.org/x/pkgsite/internal/middleware"
1413
"golang.org/x/pkgsite/internal/stdlib"
14+
"golang.org/x/text/language"
1515
"golang.org/x/text/message"
1616
)
1717

@@ -125,7 +125,7 @@ func fetchImportedByDetails(ctx context.Context, ds internal.DataSource, pkgPath
125125
// Display the number of importers, taking into account the number we
126126
// actually retrieved, the limit on that number, and the imported-by count
127127
// in the search_documents table.
128-
pr := message.NewPrinter(middleware.LanguageTag(ctx))
128+
pr := message.NewPrinter(language.English)
129129
var (
130130
display string
131131
pkgword = "package"

internal/frontend/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"golang.org/x/pkgsite/internal/godoc"
1717
"golang.org/x/pkgsite/internal/godoc/dochtml"
1818
"golang.org/x/pkgsite/internal/log"
19-
"golang.org/x/pkgsite/internal/middleware"
2019
"golang.org/x/pkgsite/internal/middleware/stats"
2120
"golang.org/x/pkgsite/internal/version"
21+
"golang.org/x/text/language"
2222
"golang.org/x/text/message"
2323
)
2424

@@ -196,7 +196,7 @@ func fetchMainDetails(ctx context.Context, ds internal.DataSource, um *internal.
196196
}
197197
isTaggedVersion := versionType != version.TypePseudo
198198
isStableVersion := semver.Major(um.Version) != "v0" && versionType == version.TypeRelease
199-
pr := message.NewPrinter(middleware.LanguageTag(ctx))
199+
pr := message.NewPrinter(language.English)
200200
return &MainDetails{
201201
ExpandReadme: expandReadme,
202202
Directories: unitDirectories(append(subdirectories, nestedModules...)),

internal/frontend/search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"golang.org/x/pkgsite/internal"
2323
"golang.org/x/pkgsite/internal/derrors"
2424
"golang.org/x/pkgsite/internal/log"
25-
"golang.org/x/pkgsite/internal/middleware"
2625
"golang.org/x/pkgsite/internal/stdlib"
2726
"golang.org/x/pkgsite/internal/version"
2827
"golang.org/x/pkgsite/internal/vuln"
28+
"golang.org/x/text/language"
2929
"golang.org/x/text/message"
3030
)
3131

@@ -254,7 +254,7 @@ func fetchSearchPage(ctx context.Context, ds internal.DataSource, cq, symbol str
254254

255255
var results []*SearchResult
256256
for _, r := range dbresults {
257-
sr := newSearchResult(r, searchSymbols, message.NewPrinter(middleware.LanguageTag(ctx)))
257+
sr := newSearchResult(r, searchSymbols, message.NewPrinter(language.English))
258258
results = append(results, sr)
259259
}
260260

internal/middleware/language.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)