summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/api/v1/user/gpg_key.go2
-rw-r--r--routers/repo/view.go2
-rw-r--r--routers/user/setting.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go
index 678816ccda..8c5e171b7f 100644
--- a/routers/api/v1/user/gpg_key.go
+++ b/routers/api/v1/user/gpg_key.go
@@ -146,7 +146,7 @@ func HandleAddGPGKeyError(ctx *context.APIContext, err error) {
case models.IsErrGPGKeyAccessDenied(err):
ctx.Error(422, "", "You do not have access to this gpg key")
case models.IsErrGPGKeyIDAlreadyUsed(err):
- ctx.Error(422, "", "A key with the same keyid is allready in database")
+ ctx.Error(422, "", "A key with the same keyid is already in database")
default:
ctx.Error(500, "AddGPGKey", err)
}
diff --git a/routers/repo/view.go b/routers/repo/view.go
index 17aa8701e2..a3c42a0fdd 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -190,7 +190,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
tp := markup.Type(blob.Name())
isSupportedMarkup := tp != ""
- // FIXME: currently set IsMarkdown for compitable
+ // FIXME: currently set IsMarkdown for compatible
ctx.Data["IsMarkdown"] = isSupportedMarkup
readmeExist := isSupportedMarkup || markup.IsReadmeFile(blob.Name())
diff --git a/routers/user/setting.go b/routers/user/setting.go
index f0cb9e7843..1cc6012820 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -489,7 +489,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm
return
}
- ctx.Flash.Success(ctx.Tr("settings.generate_token_succees"))
+ ctx.Flash.Success(ctx.Tr("settings.generate_token_success"))
ctx.Flash.Info(t.Sha1)
ctx.Redirect(setting.AppSubURL + "/user/settings/applications")