Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Refactor and update mail templates (go-gitea#35150)
  Disable Field count validation of CSV viewer (go-gitea#35228)
  split admin config settings templates to make it maintain easier (go-gitea#35294)
  Update tools/package.json dependencies, remove imagemin-zopfli (go-gitea#35406)

Author: zjjhot

modules/csv/csv.go

@@ -30,6 +30,8 @@ func CreateReader(input io.Reader, delimiter rune) *stdcsv.Reader {
 		// thus would change `\t\t` to just `\t` or `  ` (two spaces) to just ` ` (single space)
 		rd.TrimLeadingSpace = true
 	}
+	// Don't force validation of every row to have the same number of entries as the first row.
+	rd.FieldsPerRecord = -1
 	return rd
 }
 

modules/csv/csv_test.go

@@ -94,6 +94,24 @@ j, ,\x20
 			},
 			expectedDelimiter: ',',
 		},
+		// case 3 - every delimiter used, default to comma and handle differing number of fields per record
+		{
+			csv: `col1,col2
+a;b
+c@e
+f	g
+h|i
+jkl`,
+			expectedRows: [][]string{
+				{"col1", "col2"},
+				{"a;b"},
+				{"c@e"},
+				{"f	g"},
+				{"h|i"},
+				{"jkl"},
+			},
+			expectedDelimiter: ',',
+		},
 	}
 
 	for n, c := range cases {
@@ -119,21 +137,6 @@ func TestDetermineDelimiterShortBufferError(t *testing.T) {
 	assert.Nil(t, rd, "CSV reader should be mnil")
 }
 
-func TestDetermineDelimiterReadAllError(t *testing.T) {
-	rd, err := CreateReaderAndDetermineDelimiter(nil, strings.NewReader(`col1,col2
-	a;b
-	c@e
-	f	g
-	h|i
-	jkl`))
-	assert.NoError(t, err, "CreateReaderAndDetermineDelimiter() shouldn't throw error")
-	assert.NotNil(t, rd, "CSV reader should not be mnil")
-	rows, err := rd.ReadAll()
-	assert.Error(t, err, "RaadAll() should throw error")
-	assert.ErrorIs(t, err, csv.ErrFieldCount)
-	assert.Empty(t, rows, "rows should be empty")
-}
-
 func TestDetermineDelimiter(t *testing.T) {
 	cases := []struct {
 		csv               string

options/locale/locale_en-US.ini

@@ -551,6 +551,14 @@ repo.transfer.body = To accept or reject it, visit %s or just ignore it.
 repo.collaborator.added.subject = %s added you to %s
 repo.collaborator.added.text = You have been added as a collaborator of repository:
 
+repo.actions.run.failed = Run failed
+repo.actions.run.succeeded = Run succeeded
+repo.actions.run.cancelled = Run cancelled
+repo.actions.jobs.all_succeeded = All jobs have succeeded
+repo.actions.jobs.all_failed = All jobs have failed
+repo.actions.jobs.some_not_successful = Some jobs were not successful
+repo.actions.jobs.all_cancelled = All jobs have been cancelled
+
 team_invite.subject = %[1]s has invited you to join the %[2]s organization
 team_invite.text_1 = %[1]s has invited you to join team %[2]s in organization %[3]s.
 team_invite.text_2 = Please click the following link to join the team:

public/assets/img/apple-touch-icon.png

@@ -27,7 +27,7 @@ import (
 
 const (
 	tplConfig         templates.TplName = "admin/config"
-	tplConfigSettings templates.TplName = "admin/config_settings"
+	tplConfigSettings templates.TplName = "admin/config_settings/config_settings"
 )
 
 // SendTestMail send test mail to confirm mail service is OK

public/assets/img/avatar_default.png

@@ -260,18 +260,18 @@ func actionToTemplate(issue *issues_model.Issue, actionType activities_model.Act
 		}
 	}
 
-	template = typeName + "/" + name
+	template = "repo/" + typeName + "/" + name
 	ok := LoadedTemplates().BodyTemplates.Lookup(template) != nil
 	if !ok && typeName != "issue" {
-		template = "issue/" + name
+		template = "repo/issue/" + name
 		ok = LoadedTemplates().BodyTemplates.Lookup(template) != nil
 	}
 	if !ok {
-		template = typeName + "/default"
+		template = "repo/" + typeName + "/default"
 		ok = LoadedTemplates().BodyTemplates.Lookup(template) != nil
 	}
 	if !ok {
-		template = "issue/default"
+		template = "repo/issue/default"
 	}
 	return typeName, name, template
 }

public/assets/img/favicon.png

@@ -19,7 +19,7 @@ import (
 	sender_service "code.gitea.io/gitea/services/mailer/sender"
 )
 
-const tplNewReleaseMail templates.TplName = "release"
+const tplNewReleaseMail templates.TplName = "repo/release"
 
 func generateMessageIDForRelease(release *repo_model.Release) string {
 	return fmt.Sprintf("<%s/releases/%d@%s>", release.Repo.FullName(), release.ID, setting.Domain)