Skip to content

Commit 9859580

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Update JS dependences (go-gitea#29797) Unify search boxes (go-gitea#29530) Fix document error about 'make trans-copy' (go-gitea#29710) Remove jQuery AJAX from the diff functions (go-gitea#29743) Fix Safari spinner rendering (go-gitea#29801) Remove jQuery AJAX from the `repo-issue.js` file (go-gitea#29776) Improve commit record's ui in comment list (go-gitea#26619) enable tailwind nesting (go-gitea#29746)
2 parents e148c28 + 4a377c0 commit 9859580

Some content is hidden

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

63 files changed

+1414
-1092
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -839,10 +839,6 @@ release-sources: | $(DIST_DIRS)
839839
release-docs: | $(DIST_DIRS) docs
840840
tar -czf $(DIST)/release/gitea-docs-$(VERSION).tar.gz -C ./docs .
841841

842-
.PHONY: docs
843-
docs:
844-
cd docs; bash scripts/trans-copy.sh;
845-
846842
.PHONY: deps
847843
deps: deps-frontend deps-backend deps-tools deps-py
848844

docs/content/development/hacking-on-gitea.en-us.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,9 @@ Documentation for the website is found in `docs/`. If you change this you
333333
can test your changes to ensure that they pass continuous integration using:
334334

335335
```bash
336-
# from the docs directory within Gitea
337-
make trans-copy clean build
336+
make lint-md
338337
```
339338

340-
You will require a copy of [Hugo](https://gohugo.io/) to run this task. Please
341-
note: this may generate a number of untracked Git objects, which will need to
342-
be cleaned up.
343-
344339
## Visual Studio Code
345340

346341
A `launch.json` and `tasks.json` are provided within `contrib/ide/vscode` for

docs/content/development/hacking-on-gitea.zh-cn.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,9 @@ TAGS="bindata sqlite sqlite_unlock_notify" make build test-sqlite
307307
该网站的文档位于 `docs/` 中。如果你改变了文档内容,你可以使用以下测试方法进行持续集成:
308308

309309
```bash
310-
# 来自 Gitea 中的 docs 目录
311-
make trans-copy clean build
310+
make lint-md
312311
```
313312

314-
运行此任务依赖于 [Hugo](https://gohugo.io/)。请注意:这可能会生成一些未跟踪的 Git 对象,
315-
需要被清理干净。
316-
317313
## Visual Studio Code
318314

319315
`contrib/ide/vscode` 中为 Visual Studio Code 提供了 `launch.json``tasks.json`。查看

docs/scripts/trans-copy.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

options/locale/locale_en-US.ini

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,27 @@ filter.not_template = Not Template
155155
filter.public = Public
156156
filter.private = Private
157157

158+
[search]
159+
search = Search...
160+
type_tooltip = Search type
161+
fuzzy = Fuzzy
162+
fuzzy_tooltip = Include results that also match the search term closely
163+
match = Match
164+
match_tooltip = Include only results that match the exact search term
165+
repo_kind = Search repos...
166+
user_kind = Search users...
167+
org_kind = Search orgs...
168+
team_kind = Search teams...
169+
code_kind = Search code...
170+
code_search_unavailable = Code search is currently not available. Please contact the site administrator.
171+
package_kind = Search packages...
172+
project_kind = Search projects...
173+
branch_kind = Search branches...
174+
commit_kind = Search commits...
175+
runner_kind = Search runners...
176+
no_results = No matching results found.
177+
keyword_search_unavailable = Searching by keyword is currently not available. Please contact the site administrator.
178+
158179
[aria]
159180
navbar = Navigation Bar
160181
footer = Footer
@@ -330,7 +351,6 @@ collaborative_repos = Collaborative Repositories
330351
my_orgs = My Organizations
331352
my_mirrors = My Mirrors
332353
view_home = View %s
333-
search_repos = Find a repository…
334354
filter = Other Filters
335355
filter_by_team_repositories = Filter by team repositories
336356
feed_of = Feed of "%s"
@@ -351,20 +371,8 @@ issues.in_your_repos = In your repositories
351371
repos = Repositories
352372
users = Users
353373
organizations = Organizations
354-
search = Search
355374
go_to = Go to
356375
code = Code
357-
search.type.tooltip = Search type
358-
search.fuzzy = Fuzzy
359-
search.fuzzy.tooltip = Include results that also matches the search term closely
360-
search.match = Match
361-
search.match.tooltip = Include only results that matches the exact search term
362-
code_search_unavailable = Currently code search is not available. Please contact your site administrator.
363-
repo_no_results = No matching repositories found.
364-
user_no_results = No matching users found.
365-
org_no_results = No matching organizations found.
366-
code_no_results = No source code matching your search term found.
367-
code_search_results = Search results for "%s"
368376
code_last_indexed_at = Last indexed %s
369377
relevant_repositories_tooltip = Repositories that are forks or that have no topic, no icon, and no description are hidden.
370378
relevant_repositories = Only relevant repositories are being shown, <a href="%s">show unfiltered results</a>.
@@ -1324,9 +1332,8 @@ commits.desc = Browse source code change history.
13241332
commits.commits = Commits
13251333
commits.no_commits = No commits in common. "%s" and "%s" have entirely different histories.
13261334
commits.nothing_to_compare = These branches are equal.
1327-
commits.search = Search commits…
13281335
commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-01-13".
1329-
commits.find = Search
1336+
commits.search_branch = This Branch
13301337
commits.search_all = All Branches
13311338
commits.author = Author
13321339
commits.message = Message
@@ -1502,7 +1509,6 @@ issues.filter_sort.moststars = Most stars
15021509
issues.filter_sort.feweststars = Fewest stars
15031510
issues.filter_sort.mostforks = Most forks
15041511
issues.filter_sort.fewestforks = Fewest forks
1505-
issues.keyword_search_unavailable = Searching by keyword is currently not available. Please contact your site administrator.
15061512
issues.action_open = Open
15071513
issues.action_close = Close
15081514
issues.action_label = Label
@@ -2035,17 +2041,6 @@ contributors.contribution_type.commits = Commits
20352041
contributors.contribution_type.additions = Additions
20362042
contributors.contribution_type.deletions = Deletions
20372043

2038-
search = Search
2039-
search.search_repo = Search repository
2040-
search.type.tooltip = Search type
2041-
search.fuzzy = Fuzzy
2042-
search.fuzzy.tooltip = Include results that also matches the search term closely
2043-
search.match = Match
2044-
search.match.tooltip = Include only results that matches the exact search term
2045-
search.results = Search results for "%s" in <a href="%s">%s</a>
2046-
search.code_no_results = No source code matching your search term found.
2047-
search.code_search_unavailable = Currently code search is not available. Please contact your site administrator.
2048-
20492044
settings = Settings
20502045
settings.desc = Settings is where you can manage the settings for the repository
20512046
settings.options = Repository
@@ -2206,15 +2201,13 @@ settings.delete_collaborator = Remove
22062201
settings.collaborator_deletion = Remove Collaborator
22072202
settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?
22082203
settings.remove_collaborator_success = The collaborator has been removed.
2209-
settings.search_user_placeholder = Search user…
22102204
settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator.
22112205
settings.change_team_access_not_allowed = Changing team access for repository has been restricted to organization owner
22122206
settings.team_not_in_organization = The team is not in the same organization as the repository
22132207
settings.teams = Teams
22142208
settings.add_team = Add Team
22152209
settings.add_team_duplicate = Team already has the repository
22162210
settings.add_team_success = The team now have access to the repository.
2217-
settings.search_team = Search Team…
22182211
settings.change_team_permission_tip = Team's permission is set on the team setting page and can't be changed per repository
22192212
settings.delete_team_tip = This team has access to all repositories and can't be removed
22202213
settings.remove_team_success = The team's access to the repository has been removed.
@@ -2367,9 +2360,7 @@ settings.protect_whitelist_committers = Whitelist Restricted Push
23672360
settings.protect_whitelist_committers_desc = Only whitelisted users or teams will be allowed to push to this branch (but not force push).
23682361
settings.protect_whitelist_deploy_keys = Whitelist deploy keys with write access to push.
23692362
settings.protect_whitelist_users = Whitelisted users for pushing:
2370-
settings.protect_whitelist_search_users = Search users…
23712363
settings.protect_whitelist_teams = Whitelisted teams for pushing:
2372-
settings.protect_whitelist_search_teams = Search teams…
23732364
settings.protect_merge_whitelist_committers = Enable Merge Whitelist
23742365
settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch.
23752366
settings.protect_merge_whitelist_users = Whitelisted users for merging:
@@ -2614,7 +2605,6 @@ branch.default_deletion_failed = Branch "%s" is the default branch. It cannot be
26142605
branch.restore = Restore Branch "%s"
26152606
branch.download = Download Branch "%s"
26162607
branch.rename = Rename Branch "%s"
2617-
branch.search = Search Branch
26182608
branch.included_desc = This branch is part of the default branch
26192609
branch.included = Included
26202610
branch.create_new_branch = Create branch from branch:
@@ -2760,7 +2750,6 @@ teams.write_permission_desc = This team grants <strong>Write</strong> access: me
27602750
teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to and add collaborators to team repositories.
27612751
teams.create_repo_permission_desc = Additionally, this team grants <strong>Create repository</strong> permission: members can create new repositories in organization.
27622752
teams.repositories = Team Repositories
2763-
teams.search_repo_placeholder = Search repository…
27642753
teams.remove_all_repos_title = Remove all team repositories
27652754
teams.remove_all_repos_desc = This will remove all repositories from the team.
27662755
teams.add_all_repos_title = Add all repositories

0 commit comments

Comments
 (0)