makary/writefreely
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #658 from jsoref/spelling

Browse source 
Spelling
This commit is contained in:
Matt Baer 2023-09-26 11:50:19 -04:00 • committed by GitHub
commit c1609cdb90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/docker-publish.yml vendored
View file

@ -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. # This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by # They are provided by a third-party and are governed by

2
account.go
View file

@ -577,7 +577,7 @@ func getVerboseAuthUser(app *App, token string, u *User, verbose bool) *AuthUser
} }
passIsSet, err := app.db.IsUserPassSet(u.ID) passIsSet, err := app.db.IsUserPassSet(u.ID)
if err != nil { if err != nil {
// TODO: correct error meesage // TODO: correct error message
log.Error("Login: Unable to get user collections: %v", err) log.Error("Login: Unable to get user collections: %v", err)
} }

2
handle.go
View file

@ -262,7 +262,7 @@ func apiAuth(app *App, r *http.Request) (*User, error) {
return u, nil 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 // Authorization header or cookie, unlike apiAuth. It returns a different err
// in the case where no Authorization header is present. // in the case where no Authorization header is present.
func optionalAPIAuth(app *App, r *http.Request) (*User, error) { func optionalAPIAuth(app *App, r *http.Request) (*User, error) {

2
keys.go
View file

@ -51,7 +51,7 @@ func initKeyPaths(app *App) {
func generateKey(path string) error { func generateKey(path string) error {
// Check if key file exists // Check if key file exists
if _, err := os.Stat(path); err == nil { 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 return nil
} else if !os.IsNotExist(err) { } else if !os.IsNotExist(err) {
log.Error("%s", err) log.Error("%s", err)

2
posts.go
View file

@ -1068,7 +1068,7 @@ func pinPost(app *App, w http.ResponseWriter, r *http.Request) error {
ppr := PinPostResult{ID: p.ID} ppr := PinPostResult{ID: p.ID}
if err != nil { if err != nil {
ppr.Code = http.StatusInternalServerError ppr.Code = http.StatusInternalServerError
// TODO: set error messsage // TODO: set error message
} else { } else {
ppr.Code = http.StatusOK ppr.Code = http.StatusOK
} }

2
routes.go
View file

@ -82,7 +82,7 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router {
configureGenericOauth(handler, write, apper.App()) configureGenericOauth(handler, write, apper.App())
configureGiteaOauth(handler, write, apper.App()) configureGiteaOauth(handler, write, apper.App())
// Set up dyamic page handlers // Set up dynamic page handlers
// Handle auth // Handle auth
auth := write.PathPrefix("/api/auth/").Subrouter() auth := write.PathPrefix("/api/auth/").Subrouter()
if apper.App().cfg.App.OpenRegistration { if apper.App().cfg.App.OpenRegistration {

2
scripts/upgrade-server.sh
View file

@ -2,7 +2,7 @@
############################################################################### ###############################################################################
## writefreely update script ## ## writefreely update script ##
## ## ## ##
## WARNING: running this script will overwrite any modifed assets or ## ## WARNING: running this script will overwrite any modified assets or ##
## template files. If you have any custom changes to these files you ## ## template files. If you have any custom changes to these files you ##
## should back them up FIRST. ## ## should back them up FIRST. ##
## ## ## ##

2
static/js/README.md
View file

@ -1,6 +1,6 @@
# static/js # static/js
This directory is for Javascript. This directory is for JavaScript.
## Updating libraries ## Updating libraries

2
templates/bare.tmpl
View file

@ -28,7 +28,7 @@
</ul></nav> </ul></nav>
<span id="wc" class="hidden if-room room-4">0 words</span> <span id="wc" class="hidden if-room room-4">0 words</span>
</div> </div>
<noscript style="margin-left: 2em;"><strong>NOTE</strong>: for now, you'll need Javascript enabled to post.</noscript> <noscript style="margin-left: 2em;"><strong>NOTE</strong>: for now, you'll need JavaScript enabled to post.</noscript>
<div id="belt"> <div id="belt">
{{if .Editing}}<div class="tool hidden if-room"><a href="{{if .EditCollection}}{{.EditCollection.CanonicalURL}}{{.Post.Slug}}/edit/meta{{else}}/{{if .SingleUser}}d/{{end}}{{.Post.Id}}/meta{{end}}" title="Edit post metadata" id="edit-meta"><img class="ic-24dp" src="/img/ic_info_dark@2x.png" /></a></div>{{end}} {{if .Editing}}<div class="tool hidden if-room"><a href="{{if .EditCollection}}{{.EditCollection.CanonicalURL}}{{.Post.Slug}}/edit/meta{{else}}/{{if .SingleUser}}d/{{end}}{{.Post.Id}}/meta{{end}}" title="Edit post metadata" id="edit-meta"><img class="ic-24dp" src="/img/ic_info_dark@2x.png" /></a></div>{{end}}
<div class="tool"><button title="Publish your writing" id="publish" style="font-weight: bold">Post</button></div> <div class="tool"><button title="Publish your writing" id="publish" style="font-weight: bold">Post</button></div>

2
templates/classic.tmpl
View file

@ -62,7 +62,7 @@
</ul></nav> </ul></nav>
<span id="wc" class="hidden if-room room-4">0 words</span> <span id="wc" class="hidden if-room room-4">0 words</span>
</div> </div>
<noscript style="margin-left: 2em;"><strong>NOTE</strong>: for now, you'll need Javascript enabled to post.</noscript> <noscript style="margin-left: 2em;"><strong>NOTE</strong>: for now, you'll need JavaScript enabled to post.</noscript>
<div id="belt"> <div id="belt">
{{if .Editing}}<div class="tool hidden if-room"><a href="{{if .EditCollection}}{{.EditCollection.CanonicalURL}}{{.Post.Slug}}/edit/meta{{else}}/{{if .SingleUser}}d/{{end}}{{.Post.Id}}/meta{{end}}" title="Edit post metadata" id="edit-meta"><img class="ic-24dp" src="/img/ic_info_dark@2x.png" /></a></div>{{end}} {{if .Editing}}<div class="tool hidden if-room"><a href="{{if .EditCollection}}{{.EditCollection.CanonicalURL}}{{.Post.Slug}}/edit/meta{{else}}/{{if .SingleUser}}d/{{end}}{{.Post.Id}}/meta{{end}}" title="Edit post metadata" id="edit-meta"><img class="ic-24dp" src="/img/ic_info_dark@2x.png" /></a></div>{{end}}
<div class="tool hidden if-room room-2"><a href="#theme" title="Toggle theme" id="toggle-theme"><img class="ic-24dp" src="/img/ic_brightness_dark@2x.png" /></a></div> <div class="tool hidden if-room room-2"><a href="#theme" title="Toggle theme" id="toggle-theme"><img class="ic-24dp" src="/img/ic_brightness_dark@2x.png" /></a></div>

4
templates/include/post-render.tmpl
View file

@ -1,4 +1,4 @@
<!-- Miscelaneous render related template parts we use multiple times --> <!-- Miscellaneous render related template parts we use multiple times -->
{{define "collection-meta"}} {{define "collection-meta"}}
{{if .Monetization -}} {{if .Monetization -}}
<meta name="monetization" content="{{.DisplayMonetization}}" /> <meta name="monetization" content="{{.DisplayMonetization}}" />
@ -79,7 +79,7 @@
jss.push(lurl); jss.push(lurl);
} }
} }
// Load files in order, higlight on last load // Load files in order, highlight on last load
loadLanguages(jss, () => {highlight(lb)}); loadLanguages(jss, () => {highlight(lb)});
} }
}); });

2
templates/pad.tmpl
View file

@ -57,7 +57,7 @@
</ul></nav> </ul></nav>
<span id="wc" class="hidden if-room room-4">0 words</span> <span id="wc" class="hidden if-room room-4">0 words</span>
</div> </div>
<noscript style="margin-left: 2em;"><strong>NOTE</strong>: for now, you'll need Javascript enabled to post.</noscript> <noscript style="margin-left: 2em;"><strong>NOTE</strong>: for now, you'll need JavaScript enabled to post.</noscript>
<div id="belt"> <div id="belt">
{{if .Editing}}<div class="tool hidden if-room"><a href="{{if .EditCollection}}{{.EditCollection.CanonicalURL}}{{.Post.Slug}}/edit/meta{{else}}/{{if .SingleUser}}d/{{end}}{{.Post.Id}}/meta{{end}}" title="Edit post metadata" id="edit-meta"><img class="ic-24dp" src="/img/ic_info_dark@2x.png" /></a></div>{{end}} {{if .Editing}}<div class="tool hidden if-room"><a href="{{if .EditCollection}}{{.EditCollection.CanonicalURL}}{{.Post.Slug}}/edit/meta{{else}}/{{if .SingleUser}}d/{{end}}{{.Post.Id}}/meta{{end}}" title="Edit post metadata" id="edit-meta"><img class="ic-24dp" src="/img/ic_info_dark@2x.png" /></a></div>{{end}}
<div class="tool hidden if-room room-2"><a href="#theme" title="Toggle theme" id="toggle-theme"><img class="ic-24dp" src="/img/ic_brightness_dark@2x.png" /></a></div> <div class="tool hidden if-room room-2"><a href="#theme" title="Toggle theme" id="toggle-theme"><img class="ic-24dp" src="/img/ic_brightness_dark@2x.png" /></a></div>

2
templates/user/admin/users.tmpl
View file

@ -4,7 +4,7 @@
<div class="snug content-container"> <div class="snug content-container">
{{template "admin-header" .}} {{template "admin-header" .}}
<!-- TODO: if other use for flashes use patern like account_import.go --> <!-- TODO: if other use for flashes use pattern like account_import.go -->
{{if .Flashes}} {{if .Flashes}}
<p class="alert success"> <p class="alert success">
{{range .Flashes}}{{.}}{{end}} {{range .Flashes}}{{.}}{{end}}