diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d52f32b..683d5c4 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,4 +1,4 @@ -name: Build container image, publish as Github-package +name: Build container image, publish as GitHub-package # This workflow uses actions that are not certified by GitHub. # They are provided by a third-party and are governed by diff --git a/account.go b/account.go index b68d586..2d8d548 100644 --- a/account.go +++ b/account.go @@ -504,7 +504,7 @@ func login(app *App, w http.ResponseWriter, r *http.Request) error { // User has no email set, so check if they haven't added a password, either, // so we can return a more helpful error message. if hasPass, _ := app.db.IsUserPassSet(u.ID); !hasPass { - log.Info("Tried logging in to %s, but no password or email.", signin.Alias) + log.Info("Tried logging into %s, but no password or email.", signin.Alias) return impart.HTTPError{http.StatusPreconditionFailed, "This user never added a password or email address. Please contact us for help."} } } @@ -577,7 +577,7 @@ func getVerboseAuthUser(app *App, token string, u *User, verbose bool) *AuthUser } passIsSet, err := app.db.IsUserPassSet(u.ID) if err != nil { - // TODO: correct error meesage + // TODO: correct error message log.Error("Login: Unable to get user collections: %v", err) } diff --git a/handle.go b/handle.go index e0600bb..7537b61 100644 --- a/handle.go +++ b/handle.go @@ -262,7 +262,7 @@ func apiAuth(app *App, r *http.Request) (*User, error) { return u, nil } -// optionaAPIAuth is used for endpoints that accept authenticated requests via +// optionalAPIAuth is used for endpoints that accept authenticated requests via // Authorization header or cookie, unlike apiAuth. It returns a different err // in the case where no Authorization header is present. func optionalAPIAuth(app *App, r *http.Request) (*User, error) { diff --git a/keys.go b/keys.go index 7674995..b5896f7 100644 --- a/keys.go +++ b/keys.go @@ -51,7 +51,7 @@ func initKeyPaths(app *App) { func generateKey(path string) error { // Check if key file exists if _, err := os.Stat(path); err == nil { - log.Info("%s already exists. rm the file if you understand the consquences.", path) + log.Info("%s already exists. rm the file if you understand the consequences.", path) return nil } else if !os.IsNotExist(err) { log.Error("%s", err) diff --git a/pages.go b/pages.go index bf85526..6ebc3dc 100644 --- a/pages.go +++ b/pages.go @@ -109,7 +109,7 @@ func defaultPrivacyPolicy(cfg *config.Config) string { It retains as little data about you as possible, not even requiring an email address to sign up. However, if you _do_ give us your email address, it is stored encrypted in our database. We salt and hash your account's password. -We store log files, or data about what happens on our servers. We also use cookies to keep you logged in to your account. +We store log files, or data about what happens on our servers. We also use cookies to keep you logged into your account. Beyond this, it's important that you trust whoever runs **` + cfg.App.SiteName + `**. Software can only do so much to protect you -- your level of privacy protections will ultimately fall on the humans that run this particular service.` } diff --git a/pages/login.tmpl b/pages/login.tmpl index f0a54eb..0fe29a1 100644 --- a/pages/login.tmpl +++ b/pages/login.tmpl @@ -1,13 +1,13 @@ {{define "head"}}Log in — {{.SiteName}} - - + + {{end}} {{define "content"}}
-

Log in to {{.SiteName}}

+

Log into {{.SiteName}}

{{if .Flashes}}
- +
{{if .Editing}}{{end}}
diff --git a/templates/classic.tmpl b/templates/classic.tmpl index 7032f58..58f82c7 100644 --- a/templates/classic.tmpl +++ b/templates/classic.tmpl @@ -62,7 +62,7 @@
- +
{{if .Editing}}{{end}} diff --git a/templates/include/post-render.tmpl b/templates/include/post-render.tmpl index daf3984..fed16d0 100644 --- a/templates/include/post-render.tmpl +++ b/templates/include/post-render.tmpl @@ -1,4 +1,4 @@ - + {{define "collection-meta"}} {{if .Monetization -}} @@ -79,7 +79,7 @@ jss.push(lurl); } } - // Load files in order, higlight on last load + // Load files in order, highlight on last load loadLanguages(jss, () => {highlight(lb)}); } }); diff --git a/templates/pad.tmpl b/templates/pad.tmpl index 555bbb3..eb1afba 100644 --- a/templates/pad.tmpl +++ b/templates/pad.tmpl @@ -57,7 +57,7 @@
- +
{{if .Editing}}{{end}} diff --git a/templates/user/admin/users.tmpl b/templates/user/admin/users.tmpl index f6b218c..935d445 100644 --- a/templates/user/admin/users.tmpl +++ b/templates/user/admin/users.tmpl @@ -4,7 +4,7 @@
{{template "admin-header" .}} - + {{if .Flashes}}

{{range .Flashes}}{{.}}{{end}} diff --git a/templates/user/admin/view-user.tmpl b/templates/user/admin/view-user.tmpl index dac88bf..4a06c03 100644 --- a/templates/user/admin/view-user.tmpl +++ b/templates/user/admin/view-user.tmpl @@ -45,7 +45,7 @@ input.copy-text { {{if .NewPassword}}

This user's password has been reset to:

-

They can use this new password to log in to their account. This will only be shown once, so be sure to copy it and send it to them now.

+

They can use this new password to log into their account. This will only be shown once, so be sure to copy it and send it to them now.

{{if .ClearEmail}}

Their email address is: {{.ClearEmail}}

{{end}}
{{end}} diff --git a/templates/user/settings.tmpl b/templates/user/settings.tmpl index 338ea9a..829e4be 100644 --- a/templates/user/settings.tmpl +++ b/templates/user/settings.tmpl @@ -55,7 +55,7 @@ h3 { font-weight: normal; }

Passphrase

- {{if and (not .HasPass) (not .IsLogOut)}}

Add a passphrase to easily log in to your account.

{{end}} + {{if and (not .HasPass) (not .IsLogOut)}}

Add a passphrase to easily log into your account.

{{end}} {{if .HasPass}}

Current passphrase

New passphrase