Merge branch 'main' into #23701

Author: silverwind

.drone.yml

@@ -726,7 +726,7 @@ steps:
 
   # TODO: We should probably build all dependencies into a test image
   - name: test-e2e
-    image: mcr.microsoft.com/playwright:v1.31.2-focal
+    image: mcr.microsoft.com/playwright:v1.32.1-focal
     commands:
       - curl -sLO https://go.dev/dl/go1.20.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.20.linux-amd64.tar.gz
       - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea

.eslintrc.yaml

@@ -164,7 +164,7 @@ rules:
   jquery/no-parse-html: [2]
   jquery/no-prop: [0]
   jquery/no-proxy: [2]
-  jquery/no-ready: [0]
+  jquery/no-ready: [2]
   jquery/no-serialize: [2]
   jquery/no-show: [2]
   jquery/no-size: [2]

.stylelintrc.yaml

@@ -88,6 +88,7 @@ rules:
   no-invalid-position-at-import-rule: null
   no-irregular-whitespace: true
   no-unknown-animations: null
+  no-unknown-custom-properties: null
   number-max-precision: null
   property-allowed-list: null
   property-disallowed-list: null

build.go

@@ -1,7 +1,6 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-
 //go:build vendor
 
 package main

build/backport-locales.go

@@ -62,6 +62,7 @@ func main() {
 
 	// use old en-US as the base, and copy the new translations to the old locales
 	enUsOld := inisOld["options/locale/locale_en-US.ini"]
+	brokenWarned := map[string]bool{}
 	for path, iniOld := range inisOld {
 		if iniOld == enUsOld {
 			continue
@@ -77,11 +78,14 @@ func main() {
 				if secNew.HasKey(keyEnUs.Name()) {
 					oldStr := secOld.Key(keyEnUs.Name()).String()
 					newStr := secNew.Key(keyEnUs.Name()).String()
-					if oldStr != "" && strings.Count(oldStr, "%") != strings.Count(newStr, "%") {
-						fmt.Printf("WARNING: locale %s [%s]%s has different number of arguments, skipping\n", path, secEnUS.Name(), keyEnUs.Name())
-						fmt.Printf("\told: %s\n", oldStr)
-						fmt.Printf("\tnew: %s\n", newStr)
-						fmt.Println("---- ")
+					broken := oldStr != "" && strings.Count(oldStr, "%") != strings.Count(newStr, "%")
+					broken = broken || strings.Contains(oldStr, "\n") || strings.Contains(oldStr, "\n")
+					if broken {
+						brokenWarned[secOld.Name()+"."+keyEnUs.Name()] = true
+						fmt.Println("----")
+						fmt.Printf("WARNING: skip broken locale: %s , [%s] %s\n", path, secEnUS.Name(), keyEnUs.Name())
+						fmt.Printf("\told: %s\n", strings.ReplaceAll(oldStr, "\n", "\\n"))
+						fmt.Printf("\tnew: %s\n", strings.ReplaceAll(newStr, "\n", "\\n"))
 						continue
 					}
 					secOld.Key(keyEnUs.Name()).SetValue(newStr)
@@ -90,4 +94,25 @@ func main() {
 		}
 		mustNoErr(iniOld.SaveTo(path))
 	}
+
+	fmt.Println("========")
+
+	for path, iniNew := range inisNew {
+		for _, sec := range iniNew.Sections() {
+			for _, key := range sec.Keys() {
+				str := sec.Key(key.Name()).String()
+				broken := strings.Contains(str, "\n")
+				broken = broken || strings.HasPrefix(str, "`") != strings.HasSuffix(str, "`")
+				broken = broken || strings.HasPrefix(str, "\"`")
+				broken = broken || strings.HasPrefix(str, "`\"")
+				broken = broken || strings.Count(str, `"`)%2 == 1
+				broken = broken || strings.Count(str, "`")%2 == 1
+				if broken && !brokenWarned[sec.Name()+"."+key.Name()] {
+					fmt.Printf("WARNING: found broken locale: %s , [%s] %s\n", path, sec.Name(), key.Name())
+					fmt.Printf("\tstr: %s\n", strings.ReplaceAll(str, "\n", "\\n"))
+					fmt.Println("----")
+				}
+			}
+		}
+	}
 }

build/update-locales.sh

@@ -17,17 +17,10 @@ fi
 
 mv ./options/locale/locale_en-US.ini ./options/
 
-# the "ini" library for locale has many quirks
-#  * `a="xx"` gets `xx` (no quote)
-#  * `a=x\"y` gets `x\"y` (no unescaping)
-#  * `a="x\"y"` gets `"x\"y"` (no unescaping, the quotes are still there)
-#  * `a='x\"y'` gets `x\"y` (no unescaping, no quote)
-#  * `a="foo` gets `"foo` (although the quote is not closed)
-#  * 'a=`foo`' works like single-quote
-# crowdin needs the strings to be quoted correctly and doesn't like incomplete quotes
-# crowdin always outputs quoted strings if there are quotes in the strings.
-
-# this script helps to unquote the crowdin outputs for the quirky ini library
+# the "ini" library for locale has many quirks, its behavior is different from Crowdin.
+# see i18n_test.go for more details
+
+# this script helps to unquote the Crowdin outputs for the quirky ini library
 # * find all `key="...\"..."` lines
 # * remove the leading quote
 # * remove the trailing quote

custom/conf/app.example.ini

@@ -947,10 +947,10 @@ ROUTER = console
 ;USE_COMPAT_SSH_URI = false
 ;;
 ;; Close issues as long as a commit on any branch marks it as fixed
-;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages
+;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages, repo.actions.
 ;DISABLED_REPO_UNITS =
 ;;
-;; Comma separated list of default new repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages.
+;; Comma separated list of default new repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions.
 ;; Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility.
 ;; External wiki and issue tracker can't be enabled by default as it requires additional settings.
 ;; Disabled repo units will not be added to new repositories regardless if it is in the default list.

docs/content/doc/administration/adding-legal-pages.en-us.md

@@ -2,7 +2,7 @@
 date: "2019-12-28"
 title: "Adding Legal Pages"
 slug: adding-legal-pages
-weight: 9
+weight: 110
 toc: false
 draft: false
 menu:

docs/content/doc/administration/cmd-embedded.en-us.md

@@ -2,7 +2,7 @@
 date: "2020-01-25T21:00:00-03:00"
 title: "Embedded data extraction tool"
 slug: "cmd-embedded"
-weight: 40
+weight: 20
 toc: false
 draft: false
 menu:

docs/content/doc/administration/command-line.en-us.md

@@ -2,7 +2,7 @@
 date: "2017-01-01T16:00:00+02:00"
 title: "Usage: Command Line"
 slug: "command-line"
-weight: 10
+weight: 1
 toc: false
 draft: false
 menu:

docs/content/doc/administration/config-cheat-sheet.en-us.md

@@ -2,7 +2,7 @@
 date: "2016-12-26T16:00:00+02:00"
 title: "Config Cheat Sheet"
 slug: "config-cheat-sheet"
-weight: 20
+weight: 30
 toc: false
 draft: false
 menu:
@@ -103,8 +103,8 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build
 - `DEFAULT_CLOSE_ISSUES_VIA_COMMITS_IN_ANY_BRANCH`:  **false**: Close an issue if a commit on a non default branch marks it as closed.
 - `ENABLE_PUSH_CREATE_USER`:  **false**: Allow users to push local repositories to Gitea and have them automatically created for a user.
 - `ENABLE_PUSH_CREATE_ORG`:  **false**: Allow users to push local repositories to Gitea and have them automatically created for an org.
-- `DISABLED_REPO_UNITS`: **_empty_**: Comma separated list of globally disabled repo units. Allowed values: \[repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects\]
-- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages**: Comma separated list of default new repo units. Allowed values: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects\]. Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. External wiki and issue tracker can't be enabled by default as it requires additional settings. Disabled repo units will not be added to new repositories regardless if it is in the default list.
+- `DISABLED_REPO_UNITS`: **_empty_**: Comma separated list of globally disabled repo units. Allowed values: \[repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages, repo.actions\]
+- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages**: Comma separated list of default new repo units. Allowed values: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions\]. Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. External wiki and issue tracker can't be enabled by default as it requires additional settings. Disabled repo units will not be added to new repositories regardless if it is in the default list.
 - `DEFAULT_FORK_REPO_UNITS`: **repo.code,repo.pulls**: Comma separated list of default forked repo units. The set of allowed values and rules is the same as `DEFAULT_REPO_UNITS`.
 - `PREFIX_ARCHIVE_FILES`: **true**: Prefix archive files by placing them in a directory named after the repository.
 - `DISABLE_MIGRATIONS`: **false**: Disable migrating feature.

docs/content/doc/administration/config-cheat-sheet.zh-cn.md

@@ -2,7 +2,7 @@
 date: "2016-12-26T16:00:00+02:00"
 title: "配置说明"
 slug: "config-cheat-sheet"
-weight: 20
+weight: 30
 toc: false
 draft: false
 menu:

docs/content/doc/administration/customizing-gitea.en-us.md

@@ -2,7 +2,7 @@
 date: "2017-04-15T14:56:00+02:00"
 title: "Customizing Gitea"
 slug: "customizing-gitea"
-weight: 9
+weight: 100
 toc: false
 draft: false
 menu:

docs/content/doc/administration/customizing-gitea.zh-cn.md

@@ -2,7 +2,7 @@
 date: "2017-04-15T14:56:00+02:00"
 title: "自定义 Gitea 配置"
 slug: "customizing-gitea"
-weight: 9
+weight: 100
 toc: false
 draft: false
 menu:

docs/content/doc/administration/email-setup.en-us.md

@@ -81,7 +81,7 @@ SMTP_ADDR      = smtp.gmail.com
 SMTP_PORT      = 465
 FROM           = [email protected]
 USER           = example.user
-PASSWD         = ***
+PASSWD         = `***`
 MAILER_TYPE    = smtp
 IS_TLS_ENABLED = true
 ```

docs/content/doc/administration/environment-variables.en-us.md

@@ -2,7 +2,7 @@
 date: "2017-04-08T11:34:00+02:00"
 title: "Environment variables"
 slug: "environment-variables"
-weight: 20
+weight: 10
 toc: false
 draft: false
 menu:

docs/content/doc/administration/environment-variables.zh-cn.md

@@ -2,7 +2,7 @@
 date: "2017-04-08T11:34:00+02:00"
 title: "环境变量清单"
 slug: "environment-variables"
-weight: 20
+weight: 10
 toc: false
 draft: false
 menu:

docs/content/doc/administration/external-renderers.en-us.md

@@ -2,7 +2,7 @@
 date: "2018-11-23:00:00+02:00"
 title: "External renderers"
 slug: "external-renderers"
-weight: 40
+weight: 60
 toc: false
 draft: false
 menu:

docs/content/doc/administration/logging-documentation.en-us.md

@@ -2,7 +2,7 @@
 date: "2019-04-02T17:06:00+01:00"
 title: "Advanced: Logging Configuration"
 slug: "logging-configuration"
-weight: 55
+weight: 40
 toc: false
 draft: false
 menu:

docs/content/doc/administration/mail-templates.en-us.md

@@ -39,7 +39,7 @@ Currently, the following notification events make use of templates:
 | `approve`   | The head comment of a approving review for a pull request.                                                   |
 | `reject`    | The head comment of a review requesting changes for a pull request.                                          |
 | `code`      | A single comment on the code of a pull request.                                                              |
-| `assigned`  | Used was assigned to an issue or pull request.                                                               |
+| `assigned`  | User was assigned to an issue or pull request.                                                               |
 | `default`   | Any action not included in the above categories, or when the corresponding category template is not present. |
 
 The path for the template of a particular message type is:

docs/content/doc/administration/reverse-proxies.en-us.md

@@ -2,7 +2,7 @@
 date: "2018-05-22T11:00:00+00:00"
 title: "Usage: Reverse Proxies"
 slug: "reverse-proxies"
-weight: 17
+weight: 16
 toc: false
 draft: false
 menu:

docs/content/doc/administration/reverse-proxies.zh-cn.md

@@ -2,7 +2,7 @@
 date: "2018-05-22T11:00:00+00:00"
 title: "使用：反向代理"
 slug: "reverse-proxies"
-weight: 17
+weight: 16
 toc: false
 draft: false
 menu:

docs/content/doc/administration/search-engines-indexation.en-us.md

@@ -2,7 +2,7 @@
 date: "2019-12-31T13:55:00+05:00"
 title: "Advanced: Search Engines Indexation"
 slug: "search-engines-indexation"
-weight: 30
+weight: 60
 toc: false
 draft: false
 menu:

docs/content/doc/administration/signing.en-us.md

@@ -2,7 +2,7 @@
 date: "2019-08-17T10:20:00+01:00"
 title: "GPG Commit Signatures"
 slug: "signing"
-weight: 20
+weight: 50
 toc: false
 draft: false
 menu:

docs/content/doc/contributing/localization.zh-cn.md

@@ -2,7 +2,7 @@
 date: "2016-12-01T16:00:00+02:00"
 title: "本地化"
 slug: "localization"
-weight: 10
+weight: 20
 toc: false
 draft: false
 menu:

docs/content/doc/contributing/localization.zh-tw.md

@@ -2,7 +2,7 @@
 date: "2016-12-01T16:00:00+02:00"
 title: "在地化"
 slug: "localization"
-weight: 10
+weight: 20
 toc: false
 draft: false
 menu:

docs/content/doc/contributing/translation.de-de.md

@@ -1,7 +1,7 @@
 ---
 date: "2021-01-22T00:00:00+02:00"
 title: "Übersetzungs Richtlinien"
-weight: 10
+weight: 70
 toc: true
 draft: false
 menu:

docs/content/doc/contributing/translation.en-us.md

@@ -1,7 +1,7 @@
 ---
 date: "2021-01-22T00:00:00+02:00"
 title: "Translation Guidelines"
-weight: 10
+weight: 70
 toc: true
 draft: false
 menu:

docs/content/doc/development/integrations.en-us.md

@@ -2,7 +2,7 @@
 date: "2019-04-15T17:29:00+08:00"
 title: "Integrations"
 slug: "integrations"
-weight: 40
+weight: 65
 toc: false
 draft: false
 menu:

docs/content/doc/development/integrations.zh-tw.md

@@ -2,7 +2,7 @@
 date: "2019-04-15T17:29:00+08:00"
 title: "整合"
 slug: "integrations"
-weight: 40
+weight: 65
 toc: false
 draft: false
 menu:

docs/content/doc/development/migrations.en-us.md

@@ -2,7 +2,7 @@
 date: "2019-04-15T17:29:00+08:00"
 title: "Migrations Interfaces"
 slug: "migrations-interfaces"
-weight: 30
+weight: 55
 toc: false
 draft: false
 menu:

docs/content/doc/development/migrations.zh-tw.md

@@ -2,7 +2,7 @@
 date: "2019-04-15T17:29:00+08:00"
 title: "遷移介面"
 slug: "migrations-interfaces"
-weight: 30
+weight: 55
 toc: false
 draft: false
 menu:

docs/content/doc/help/search.de-de.md

@@ -2,11 +2,11 @@
 date: "2019-11-12T16:00:00+02:00"
 title: "Search"
 slug: "search"
-weight: 4
+weight: 1
 toc: false
 draft: false
 sitemap:
-  priority : 0.1
+  priority : 1
 layout: "search"
 ---
 

docs/content/doc/help/search.en-us.md

@@ -2,11 +2,11 @@
 date: "2019-11-12T16:00:00+02:00"
 title: "Search"
 slug: "search"
-weight: 4
+weight: 1
 toc: false
 draft: false
 sitemap:
-  priority : 0.1
+  priority : 1
 layout: "search"
 ---