Rename Slogan to AppSlogan

This commit is contained in:
mirko 2024-05-14 16:55:25 +02:00
parent d2fa633e7b
commit 7848c0461c
6 changed files with 12 additions and 12 deletions

View file

@ -43,8 +43,8 @@
;; App name that shows in every page title
APP_NAME = ; Gitea: Git with a cup of tea
;;
;; SLOGAN shows a slogan near the App name in very page title
;SLOGAN =
;; APP_SLOGAN shows a slogan near the App name in very page title
;APP_SLOGAN =
;;
;; RUN_USER will automatically detect the current user - but you can set it here change it if you run locally
RUN_USER = ; git

View file

@ -45,9 +45,9 @@ var (
// AppName is the Application name, used in the page title.
// It maps to ini:"APP_NAME"
AppName string
// Slogan is the Application slogan.
// It maps to ini:"SLOGAN"
Slogan string
// AppSlogan is the Application slogan.
// It maps to ini:"APP_SLOGAN"
AppSlogan string
// AppURL is the Application ROOT_URL. It always has a '/' suffix
// It maps to ini:"ROOT_URL"
AppURL string
@ -170,7 +170,7 @@ func MakeAbsoluteAssetURL(appURL, staticURLPrefix string) string {
func loadServerFrom(rootCfg ConfigProvider) {
sec := rootCfg.Section("server")
AppName = rootCfg.Section("").Key("APP_NAME").MustString("Forgejo: Beyond coding. We Forge.")
Slogan = rootCfg.Section("").Key("SLOGAN").MustString("")
AppSlogan = rootCfg.Section("").Key("APP_SLOGAN").MustString("")
Domain = sec.Key("DOMAIN").MustString("localhost")
HTTPAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
HTTPPort = sec.Key("HTTP_PORT").MustString("3000")

View file

@ -78,8 +78,8 @@ func NewFuncMap() template.FuncMap {
"AppName": func() string {
return setting.AppName
},
"Slogan": func() string {
return setting.Slogan
"AppSlogan": func() string {
return setting.AppSlogan
},
"AppSubUrl": func() string {
return setting.AppSubURL

View file

@ -3196,7 +3196,7 @@ auths.invalid_openIdConnectAutoDiscoveryURL = Invalid Auto Discovery URL (this m
config.server_config = Server configuration
config.app_name = Instance title
config.slogan = Instance slogan
config.app_slogan = Instance slogan
config.app_ver = Forgejo version
config.app_url = Base URL
config.custom_conf = Configuration file path

View file

@ -7,8 +7,8 @@
<dl class="admin-dl-horizontal">
<dt>{{ctx.Locale.Tr "admin.config.app_name"}}</dt>
<dd>{{AppName}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.slogan"}}</dt>
<dd>{{Slogan}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.app_slogan"}}</dt>
<dd>{{AppSlogan}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.app_ver"}}</dt>
<dd>{{AppVer}}{{.AppBuiltWith}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.custom_conf"}}</dt>

View file

@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
{{/* Display `- .Repository.FullName` only if `.Title` does not already start with that. */}}
<title>{{if .Title}}{{.Title}} - {{end}}{{if and (.Repository.Name) (not (StringUtils.HasPrefix .Title .Repository.FullName))}}{{.Repository.FullName}} - {{end}}{{AppName}}{{if Slogan}} - {{Slogan}}{{end}}</title>
<title>{{if .Title}}{{.Title}} - {{end}}{{if and (.Repository.Name) (not (StringUtils.HasPrefix .Title .Repository.FullName))}}{{.Repository.FullName}} - {{end}}{{AppName}}{{if AppSlogan}} - {{AppSlogan}}{{end}}</title>
{{if .ManifestData}}<link rel="manifest" href="data:{{.ManifestData}}">{{end}}
<meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}{{MetaAuthor}}{{end}}">
<meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}{{MetaDescription}}{{end}}">