Skip to content

Commit cf6eafd

Browse files
LaoQiLaoQi
committed
Merge remote-tracking branch 'base/main';Move migration file
2 parents e0797d7 + ce65613 commit cf6eafd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1240
-937
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ WEB_DIRS := web_src/js web_src/css
146146

147147
ESLINT_FILES := web_src/js tools *.js *.ts *.cjs tests/e2e
148148
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
149-
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
149+
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml)) $(filter-out tools/misspellings.csv, $(wildcard tools/*))
150150
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
151151

152152
GO_SOURCES := $(wildcard *.go)

‎README.md‎

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,64 @@ for the full license text.
150150
<details>
151151
<summary>Looking for an overview of the interface? Check it out!</summary>
152152

153-
|![Dashboard](https://dl.gitea.com/screenshots/home_timeline.png)|![User Profile](https://dl.gitea.com/screenshots/user_profile.png)|![Global Issues](https://dl.gitea.com/screenshots/global_issues.png)|
154-
|:---:|:---:|:---:|
155-
|![Branches](https://dl.gitea.com/screenshots/branches.png)|![Web Editor](https://dl.gitea.com/screenshots/web_editor.png)|![Activity](https://dl.gitea.com/screenshots/activity.png)|
156-
|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)|
157-
|![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|
153+
### Login/Register Page
154+
155+
![Login](https://dl.gitea.com/screenshots/login.png)
156+
![Register](https://dl.gitea.com/screenshots/register.png)
157+
158+
### User Dashboard
159+
160+
![Home](https://dl.gitea.com/screenshots/home.png)
161+
![Issues](https://dl.gitea.com/screenshots/issues.png)
162+
![Pull Requests](https://dl.gitea.com/screenshots/pull_requests.png)
163+
![Milestones](https://dl.gitea.com/screenshots/milestones.png)
164+
165+
### User Profile
166+
167+
![Profile](https://dl.gitea.com/screenshots/user_profile.png)
168+
169+
### Explore
170+
171+
![Repos](https://dl.gitea.com/screenshots/explore_repos.png)
172+
![Users](https://dl.gitea.com/screenshots/explore_users.png)
173+
![Orgs](https://dl.gitea.com/screenshots/explore_orgs.png)
174+
175+
### Repository
176+
177+
![Home](https://dl.gitea.com/screenshots/repo_home.png)
178+
![Commits](https://dl.gitea.com/screenshots/repo_commits.png)
179+
![Branches](https://dl.gitea.com/screenshots/repo_branches.png)
180+
![Labels](https://dl.gitea.com/screenshots/repo_labels.png)
181+
![Milestones](https://dl.gitea.com/screenshots/repo_milestones.png)
182+
![Releases](https://dl.gitea.com/screenshots/repo_releases.png)
183+
![Tags](https://dl.gitea.com/screenshots/repo_tags.png)
184+
185+
#### Repository Issue
186+
187+
![List](https://dl.gitea.com/screenshots/repo_issues.png)
188+
![Issue](https://dl.gitea.com/screenshots/repo_issue.png)
189+
190+
#### Repository Pull Requests
191+
192+
![List](https://dl.gitea.com/screenshots/repo_pull_requests.png)
193+
![Pull Request](https://dl.gitea.com/screenshots/repo_pull_request.png)
194+
![File](https://dl.gitea.com/screenshots/repo_pull_request_file.png)
195+
![Commits](https://dl.gitea.com/screenshots/repo_pull_request_commits.png)
196+
197+
#### Repository Actions
198+
199+
![List](https://dl.gitea.com/screenshots/repo_actions.png)
200+
![Details](https://dl.gitea.com/screenshots/repo_actions_run.png)
201+
202+
#### Repository Activity
203+
204+
![Activity](https://dl.gitea.com/screenshots/repo_activity.png)
205+
![Contributors](https://dl.gitea.com/screenshots/repo_contributors.png)
206+
![Code Frequency](https://dl.gitea.com/screenshots/repo_code_frequency.png)
207+
![Recent Commits](https://dl.gitea.com/screenshots/repo_recent_commits.png)
208+
209+
### Organization
210+
211+
![Home](https://dl.gitea.com/screenshots/org_home.png)
158212

159213
</details>

‎README_ZH.md‎

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,64 @@ Gitea 提供官方的 [go-sdk](https://gitea.com/gitea/go-sdk)，以及名为 [t
9393
<details>
9494
<summary>截图</summary>
9595

96-
|![Dashboard](https://dl.gitea.com/screenshots/home_timeline.png)|![User Profile](https://dl.gitea.com/screenshots/user_profile.png)|![Global Issues](https://dl.gitea.com/screenshots/global_issues.png)|
97-
|:---:|:---:|:---:|
98-
|![Branches](https://dl.gitea.com/screenshots/branches.png)|![Web Editor](https://dl.gitea.com/screenshots/web_editor.png)|![Activity](https://dl.gitea.com/screenshots/activity.png)|
99-
|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)|
100-
|![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|
96+
### 登录界面
97+
98+
![登录](https://dl.gitea.com/screenshots/login.png)
99+
![注册](https://dl.gitea.com/screenshots/register.png)
100+
101+
### 用户首页
102+
103+
![首页](https://dl.gitea.com/screenshots/home.png)
104+
![工单列表](https://dl.gitea.com/screenshots/issues.png)
105+
![合并请求列表](https://dl.gitea.com/screenshots/pull_requests.png)
106+
![里程碑列表](https://dl.gitea.com/screenshots/milestones.png)
107+
108+
### 用户资料
109+
110+
![用户资料](https://dl.gitea.com/screenshots/user_profile.png)
111+
112+
### 探索
113+
114+
![仓库列表](https://dl.gitea.com/screenshots/explore_repos.png)
115+
![用户列表](https://dl.gitea.com/screenshots/explore_users.png)
116+
![组织列表](https://dl.gitea.com/screenshots/explore_orgs.png)
117+
118+
### 仓库
119+
120+
![首页](https://dl.gitea.com/screenshots/repo_home.png)
121+
![提交列表](https://dl.gitea.com/screenshots/repo_commits.png)
122+
![分支列表](https://dl.gitea.com/screenshots/repo_branches.png)
123+
![标签列表](https://dl.gitea.com/screenshots/repo_labels.png)
124+
![里程碑列表](https://dl.gitea.com/screenshots/repo_milestones.png)
125+
![版本发布](https://dl.gitea.com/screenshots/repo_releases.png)
126+
![标签列表](https://dl.gitea.com/screenshots/repo_tags.png)
127+
128+
#### 仓库工单
129+
130+
![列表](https://dl.gitea.com/screenshots/repo_issues.png)
131+
![工单](https://dl.gitea.com/screenshots/repo_issue.png)
132+
133+
#### 仓库合并请求
134+
135+
![列表](https://dl.gitea.com/screenshots/repo_pull_requests.png)
136+
![合并请求](https://dl.gitea.com/screenshots/repo_pull_request.png)
137+
![文件](https://dl.gitea.com/screenshots/repo_pull_request_file.png)
138+
![提交列表](https://dl.gitea.com/screenshots/repo_pull_request_commits.png)
139+
140+
#### 仓库 Actions
141+
142+
![列表](https://dl.gitea.com/screenshots/repo_actions.png)
143+
![Run](https://dl.gitea.com/screenshots/repo_actions_run.png)
144+
145+
#### 仓库动态
146+
147+
![动态](https://dl.gitea.com/screenshots/repo_activity.png)
148+
![贡献者](https://dl.gitea.com/screenshots/repo_contributors.png)
149+
![代码频率](https://dl.gitea.com/screenshots/repo_code_frequency.png)
150+
![最近的提交](https://dl.gitea.com/screenshots/repo_recent_commits.png)
151+
152+
### 组织
153+
154+
![首页](https://dl.gitea.com/screenshots/org_home.png)
101155

102156
</details>

‎models/actions/run_list.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
repo_model "code.gitea.io/gitea/models/repo"
1111
user_model "code.gitea.io/gitea/models/user"
1212
"code.gitea.io/gitea/modules/container"
13+
"code.gitea.io/gitea/modules/translation"
1314
webhook_module "code.gitea.io/gitea/modules/webhook"
1415

1516
"xorm.io/builder"
@@ -112,14 +113,14 @@ type StatusInfo struct {
112113
}
113114

114115
// GetStatusInfoList returns a slice of StatusInfo
115-
func GetStatusInfoList(ctx context.Context) []StatusInfo {
116+
func GetStatusInfoList(ctx context.Context, lang translation.Locale) []StatusInfo {
116117
// same as those in aggregateJobStatus
117118
allStatus := []Status{StatusSuccess, StatusFailure, StatusWaiting, StatusRunning}
118119
statusInfoList := make([]StatusInfo, 0, 4)
119120
for _, s := range allStatus {
120121
statusInfoList = append(statusInfoList, StatusInfo{
121122
Status: int(s),
122-
DisplayedStatus: s.String(),
123+
DisplayedStatus: s.LocaleString(lang),
123124
})
124125
}
125126
return statusInfoList

‎models/fixtures/issue_pin.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-
2+
id: 1
3+
repo_id: 2
4+
issue_id: 4
5+
is_pull: false
6+
pin_order: 1

0 commit comments

Comments
 (0)