Skip to content

Commit e2f60f4

Browse files
jonasfranzjonasfranz
committed
Merge branch 'master' into feat/approval-new
2 parents 4ad72de + 2eabf18 commit e2f60f4

File tree

8 files changed

+81
-30
lines changed

8 files changed

+81
-30
lines changed

‎custom/conf/app.ini.sample

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -568,28 +568,21 @@ ENABLE_SWAGGER_ENDPOINT = true
568568
MAX_RESPONSE_ITEMS = 50
569569

570570
[i18n]
571-
LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
572-
NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어
573-
574-
[U2F]
575-
; Two Factor authentication with security keys
576-
; https://developers.yubico.com/U2F/App_ID.html
577-
APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s
578-
; Comma seperated list of truisted facets
579-
TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s
580-
571+
LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
572+
NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어
581573

582574
; Used for datetimepicker
583575
[i18n.datelang]
584576
en-US = en
585577
zh-CN = zh
586-
zh-HK = zh-TW
578+
zh-HK = zh-HK
587579
zh-TW = zh-TW
588580
de-DE = de
589581
fr-FR = fr
590582
nl-NL = nl
591583
lv-LV = lv
592584
ru-RU = ru
585+
uk-UA = uk
593586
ja-JP = ja
594587
es-ES = es
595588
pt-BR = pt-BR
@@ -603,6 +596,13 @@ sr-SP = sr
603596
sv-SE = sv
604597
ko-KR = ko
605598

599+
[U2F]
600+
; Two Factor authentication with security keys
601+
; https://developers.yubico.com/U2F/App_ID.html
602+
APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s
603+
; Comma seperated list of truisted facets
604+
TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s
605+
606606
; Extension mapping to highlight class
607607
; e.g. .toml=ini
608608
[highlight.mapping]

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,41 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
278278
- `MAX_GIT_DIFF_FILES`: **100**: Max number of files shown in diff view.
279279
- `GC_ARGS`: **\<empty\>**: Arguments for command `git gc`, e.g. `--aggressive --auto`.
280280

281+
## API (`api`)
282+
283+
- `ENABLE_SWAGGER_ENDPOINT`: **true**: Enables /api/swagger, /api/v1/swagger etc. endpoints. True or false; default is true.
284+
- `MAX_RESPONSE_ITEMS`: **50**: Max number of items in a page
285+
286+
## i18n (`i18n`)
287+
288+
- `LANGS`: **en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR**: List of locales shown in language selector
289+
- `NAMES`: **English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어**: Visible names corresponding to the locales
290+
291+
### i18n - Datepicker Language (`i18n.datelang`)
292+
Maps locales to the languages used by the datepicker plugin
293+
294+
- `en-US`: **en**
295+
- `zh-CN`: **zh**
296+
- `zh-HK`: **zh-HK**
297+
- `zh-TW`: **zh-TW**
298+
- `de-DE`: **de**
299+
- `fr-FR`: **fr**
300+
- `nl-NL`: **nl**
301+
- `lv-LV`: **lv**
302+
- `ru-RU`: **ru**
303+
- `ja-JP`: **ja**
304+
- `es-ES`: **es**
305+
- `pt-BR`: **pt-BR**
306+
- `pl-PL`: **pl**
307+
- `bg-BG`: **bg**
308+
- `it-IT`: **it**
309+
- `fi-FI`: **fi**
310+
- `tr-TR`: **tr**
311+
- `cs-CZ`: **cs-CZ**
312+
- `sr-SP`: **sr**
313+
- `sv-SE`: **sv**
314+
- `ko-KR`: **ko**
315+
281316
## U2F (`U2F`)
282317
- `APP_ID`: **`ROOT_URL`**: Declares the facet of the application. Requires HTTPS.
283318
- `TRUSTED_FACETS`: List of additional facets which are trusted. This is not support by all browsers.

‎modules/setting/defaults.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import (
55
)
66

77
var (
8-
defaultLangs = strings.Split("en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR", ",")
9-
defaultLangNames = strings.Split("English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어", ",")
8+
defaultLangs = strings.Split("en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR", ",")
9+
defaultLangNames = strings.Split("English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어", ",")
1010
)

‎options/locale/locale_pt-BR.ini

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,10 @@ issues.filter_sort.recentupdate=Mais recentemente atualizados
693693
issues.filter_sort.leastupdate=Menos recentemente atualizados
694694
issues.filter_sort.mostcomment=Mais comentados
695695
issues.filter_sort.leastcomment=Menos comentados
696+
issues.filter_sort.moststars=Mais estrelas
697+
issues.filter_sort.feweststars=Menos estrelas
698+
issues.filter_sort.mostforks=Mais forks
699+
issues.filter_sort.fewestforks=Menos forks
696700
issues.action_open=Abrir
697701
issues.action_close=Fechar
698702
issues.action_label=Etiqueta
@@ -773,9 +777,9 @@ issues.due_date_form_update=Modificar data limite
773777
issues.due_date_form_remove=Remover data limite
774778
issues.due_date_not_writer=Você deve ter permissão de escrita no repositório para atualizar a data limite de uma issue.
775779
issues.due_date_not_set=Data limite não informada.
776-
issues.due_date_added=adicionou a data limite %s à %s
777-
issues.due_date_modified=modificou a data limite para %s ao invés de %s à %s
778-
issues.due_date_remove=removeu a data limite %s à %s
780+
issues.due_date_added=adicionou a data limite %s %s
781+
issues.due_date_modified=modificou a data limite para %s ao invés de %s %s
782+
issues.due_date_remove=removeu a data limite %s %s
779783
issues.due_date_overdue=Em atraso
780784

781785
pulls.desc=Habilitar solicitações de merge e revisões de código.
@@ -1359,6 +1363,7 @@ repos.name=Nome
13591363
repos.private=Privado
13601364
repos.watches=Observadores
13611365
repos.stars=Favoritos
1366+
repos.forks=Forks
13621367
repos.issues=Issues
13631368
repos.size=Tamanho
13641369

@@ -1385,6 +1390,7 @@ auths.attribute_username_placeholder=Deixe em branco para usar o nome de usuári
13851390
auths.attribute_name=Atributo primeiro nome
13861391
auths.attribute_surname=Atributo sobrenome
13871392
auths.attribute_mail=Atributo e-mail
1393+
auths.attribute_ssh_public_key=Atributo de chave SSH pública
13881394
auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN
13891395
auths.use_paged_search=Use a pesquisa paginada
13901396
auths.search_page_size=Tamanho da página

‎options/locale/locale_uk-UA.ini

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ issues.opened_by=%[1]s відкрито <a href="%[2]s">%[3]s</a>
570570
issues.opened_by_fake=%[1]s відкрито %[2]s
571571
issues.previous=Попередній
572572
issues.next=Далі
573-
issues.open_title=Відкрити
573+
issues.open_title=Відкрито
574574
issues.closed_title=Закрито
575575
issues.num_comments=%d коментарів
576576
issues.commented_at=`прокоментував(ла) <a href="#%s">%s</a>`
@@ -737,7 +737,7 @@ search.search_repo=Пошук репозиторію
737737

738738
settings=Налаштування
739739
settings.options=Репозиторій
740-
settings.collaboration=Співробітники
740+
settings.collaboration=Співавтори
741741
settings.collaboration.admin=Адміністратор
742742
settings.collaboration.write=Запис
743743
settings.collaboration.read=Читати
@@ -782,7 +782,9 @@ settings.update_settings_success=Налаштування репозиторію
782782
settings.transfer_owner=Новий власник
783783
settings.make_transfer=Здіснити перенесення
784784
settings.confirm_delete=Видалити репозиторій
785+
settings.add_collaborator=Додати співавтора
785786
settings.delete_collaborator=Видалити
787+
settings.collaborator_deletion=Видалити співавтора
786788
settings.search_user_placeholder=Пошук користувача…
787789
settings.add_webhook=Додати веб-хук
788790
settings.webhook_deletion=Видалити веб-хук
@@ -852,6 +854,7 @@ settings.protect_whitelist_search_teams=Пошук команд…
852854
settings.add_protected_branch=Увімкнути захист
853855
settings.delete_protected_branch=Вимкнути захист
854856
settings.choose_branch=Оберіть гілку…
857+
settings.no_protected_branch=Немає захищених гілок.
855858

856859
diff.browse_source=Переглянути джерело
857860
diff.parent=джерело
@@ -1050,6 +1053,7 @@ repos.name=Назва
10501053
repos.private=Приватний
10511054
repos.watches=Стежать
10521055
repos.stars=В обраному
1056+
repos.forks=Форки
10531057
repos.issues=Проблеми
10541058
repos.size=Розмір
10551059

‎options/locale/locale_zh-CN.ini

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
app_desc=一款极易搭建的自助 Git 服务
22

33
home=首页
4-
dashboard=控制面板
4+
dashboard=首页
55
explore=探索
66
help=帮助
77
sign_in=登录
@@ -47,11 +47,11 @@ u2f_reload=重新加载
4747
repository=仓库
4848
organization=组织
4949
mirror=镜像
50-
new_repo=创建新的仓库
50+
new_repo=创建仓库
5151
new_migrate=迁移外部仓库
5252
new_mirror=创建新的镜像
5353
new_fork=新的仓库Fork
54-
new_org=创建新的组织
54+
new_org=创建组织
5555
manage_org=管理我的组织
5656
admin_panel=管理后台
5757
account_settings=帐户设置
@@ -693,6 +693,10 @@ issues.filter_sort.recentupdate=最近更新
693693
issues.filter_sort.leastupdate=最少更新
694694
issues.filter_sort.mostcomment=最多评论
695695
issues.filter_sort.leastcomment=最少评论
696+
issues.filter_sort.moststars=点赞由多到少
697+
issues.filter_sort.feweststars=点赞由少到多
698+
issues.filter_sort.mostforks=派生由多到少
699+
issues.filter_sort.fewestforks=派生由少到多
696700
issues.action_open=开启
697701
issues.action_close=关闭
698702
issues.action_label=标签
@@ -738,7 +742,7 @@ issues.label_deletion_desc=删除标签会将其从所有问题中删除。继
738742
issues.label_deletion_success=该标签已被删除。
739743
issues.label.filter_sort.alphabetically=按字母顺序排序
740744
issues.label.filter_sort.reverse_alphabetically=按字母逆序排序
741-
issues.label.filter_sort.by_size=大小
745+
issues.label.filter_sort.by_size=从小到大
742746
issues.label.filter_sort.reverse_by_size=从大到小
743747
issues.num_participants=%d 名参与者
744748
issues.attachment.open_tab=`在新的标签页中查看 '%s'`
@@ -1246,14 +1250,14 @@ teams.remove_repo=移除仓库
12461250
teams.add_nonexistent_repo=您尝试添加到团队的仓库不存在，请先创建仓库！
12471251
12481252
[admin]
1249-
dashboard=控制面板
1253+
dashboard=管理面板
12501254
users=帐户管理
12511255
organizations=组织管理
12521256
repositories=仓库管理
12531257
authentication=认证源
12541258
config=应用配置
12551259
notices=系统提示
1256-
monitor=应用监控面板
1260+
monitor=监控面板
12571261
first_page=首页
12581262
last_page=末页
12591263
total=总计：%d
@@ -1359,8 +1363,9 @@ repos.name=名称
13591363
repos.private=私有库
13601364
repos.watches=关注数
13611365
repos.stars=点赞数
1366+
repos.forks=派生数
13621367
repos.issues=工单数
1363-
repos.size=从小到大
1368+
repos.size=大小
13641369
13651370
auths.auth_manage_panel=认证源管理
13661371
auths.new=添加认证源
@@ -1385,6 +1390,7 @@ auths.attribute_username_placeholder=置空将使用Gitea的用户名。
13851390
auths.attribute_name=名字属性
13861391
auths.attribute_surname=姓氏属性
13871392
auths.attribute_mail=电子邮箱属性
1393+
auths.attribute_ssh_public_key=SSH公钥属性
13881394
auths.attributes_in_bind=从 Bind DN 中拉取属性信息
13891395
auths.use_paged_search=使用分页搜索
13901396
auths.search_page_size=分页大小
@@ -1554,11 +1560,11 @@ monitor.name=任务名称
15541560
monitor.schedule=任务安排
15551561
monitor.next=下次执行时间
15561562
monitor.previous=上次执行时间
1557-
monitor.execute_times=执行时间
1563+
monitor.execute_times=执行时长
15581564
monitor.process=运行中进程
15591565
monitor.desc=进程描述
15601566
monitor.start=开始时间
1561-
monitor.execute_time=执行时间
1567+
monitor.execute_time=执行时长
15621568
15631569
notices.system_notice_list=系统提示管理
15641570
notices.view_detail_header=查看提示详情
@@ -1570,7 +1576,7 @@ notices.delete_selected=删除选中项
15701576
notices.delete_all=删除所有提示
15711577
notices.type=提示类型
15721578
notices.type_1=仓库
1573-
notices.desc=进程描述
1579+
notices.desc=提示描述
15741580
notices.op=操作
15751581
notices.delete_success=系统通知已被删除。
15761582

‎routers/routes/routes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func RegisterRoutes(m *macaron.Macaron) {
168168
m.Head("/", func() string {
169169
return ""
170170
})
171-
m.Get("/", ignSignIn, routers.Home)
171+
m.Get("/", routers.Home)
172172
m.Group("/explore", func() {
173173
m.Get("", func(ctx *context.Context) {
174174
ctx.Redirect(setting.AppSubURL + "/explore/repos")

‎templates/repo/bare.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="ui grid">
66
<div class="sixteen wide column content">
77
{{template "base/alert" .}}
8-
{{if .IsRepositoryAdmin}}
8+
{{if .IsRepositoryWriter}}
99
<h4 class="ui top attached header">
1010
{{.i18n.Tr "repo.quick_guide"}}
1111
</h4>

0 commit comments

Comments
 (0)