From 3623f12a28e93b9bd367791fac0ca1fdd56f4e51 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 24 May 2018 22:28:53 +0800 Subject: [PATCH 1/9] fix writer cannot read bare repo guide (#4033) --- templates/repo/bare.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/bare.tmpl b/templates/repo/bare.tmpl index bd37228ad1..f1e1d58542 100644 --- a/templates/repo/bare.tmpl +++ b/templates/repo/bare.tmpl @@ -5,7 +5,7 @@
{{template "base/alert" .}} - {{if .IsRepositoryAdmin}} + {{if .IsRepositoryWriter}}

{{.i18n.Tr "repo.quick_guide"}}

From 81241b9380d853f0061b2b03a82f7ed3d0158389 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Thu, 24 May 2018 14:30:48 +0000 Subject: [PATCH 2/9] [skip ci] Updated translations via Crowdin --- options/locale/locale_pt-BR.ini | 6 ++++++ options/locale/locale_uk-UA.ini | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index e1e2710e65..d94bbbd494 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -693,6 +693,10 @@ issues.filter_sort.recentupdate=Mais recentemente atualizados issues.filter_sort.leastupdate=Menos recentemente atualizados issues.filter_sort.mostcomment=Mais comentados issues.filter_sort.leastcomment=Menos comentados +issues.filter_sort.moststars=Mais estrelas +issues.filter_sort.feweststars=Menos estrelas +issues.filter_sort.mostforks=Mais forks +issues.filter_sort.fewestforks=Menos forks issues.action_open=Abrir issues.action_close=Fechar issues.action_label=Etiqueta @@ -1359,6 +1363,7 @@ repos.name=Nome repos.private=Privado repos.watches=Observadores repos.stars=Favoritos +repos.forks=Forks repos.issues=Issues repos.size=Tamanho @@ -1385,6 +1390,7 @@ auths.attribute_username_placeholder=Deixe em branco para usar o nome de usuári auths.attribute_name=Atributo primeiro nome auths.attribute_surname=Atributo sobrenome auths.attribute_mail=Atributo e-mail +auths.attribute_ssh_public_key=Atributo de chave SSH pública auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN auths.use_paged_search=Use a pesquisa paginada auths.search_page_size=Tamanho da página diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 285100441c..4ab17a73c9 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -737,7 +737,7 @@ search.search_repo=Пошук репозиторію settings=Налаштування settings.options=Репозиторій -settings.collaboration=Співробітники +settings.collaboration=Співавтори settings.collaboration.admin=Адміністратор settings.collaboration.write=Запис settings.collaboration.read=Читати @@ -782,7 +782,9 @@ settings.update_settings_success=Налаштування репозиторію settings.transfer_owner=Новий власник settings.make_transfer=Здіснити перенесення settings.confirm_delete=Видалити репозиторій +settings.add_collaborator=Додати співавтора settings.delete_collaborator=Видалити +settings.collaborator_deletion=Видалити співавтора settings.search_user_placeholder=Пошук користувача… settings.add_webhook=Додати веб-хук settings.webhook_deletion=Видалити веб-хук @@ -1050,6 +1052,7 @@ repos.name=Назва repos.private=Приватний repos.watches=Стежать repos.stars=В обраному +repos.forks=Форки repos.issues=Проблеми repos.size=Розмір From e225b5c512e194245235694f300d48c79dd2683f Mon Sep 17 00:00:00 2001 From: 3_1_3_u Date: Thu, 24 May 2018 18:29:33 +0300 Subject: [PATCH 3/9] add a Ukrainian language (#4036) --- custom/conf/app.ini.sample | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index f9a188c3a1..aad6e9c762 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -568,8 +568,8 @@ ENABLE_SWAGGER_ENDPOINT = true MAX_RESPONSE_ITEMS = 50 [i18n] -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 -NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어 +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 +NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어 [U2F] ; Two Factor authentication with security keys @@ -590,6 +590,7 @@ fr-FR = fr nl-NL = nl lv-LV = lv ru-RU = ru +uk-UA = uk ja-JP = ja es-ES = es pt-BR = pt-BR From 062111de3be1750bebba305b030965d84382968e Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Thu, 24 May 2018 15:30:53 +0000 Subject: [PATCH 4/9] [skip ci] Updated translations via Crowdin --- options/locale/locale_uk-UA.ini | 1 + options/locale/locale_zh-CN.ini | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 4ab17a73c9..2228722a98 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -854,6 +854,7 @@ settings.protect_whitelist_search_teams=Пошук команд… settings.add_protected_branch=Увімкнути захист settings.delete_protected_branch=Вимкнути захист settings.choose_branch=Оберіть гілку… +settings.no_protected_branch=Немає захищених гілок. diff.browse_source=Переглянути джерело diff.parent=джерело diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 29f8be1c3c..b57eeed1a5 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1,7 +1,7 @@ app_desc=一款极易搭建的自助 Git 服务 home=首页 -dashboard=控制面板 +dashboard=首页 explore=探索 help=帮助 sign_in=登录 @@ -47,11 +47,11 @@ u2f_reload=重新加载 repository=仓库 organization=组织 mirror=镜像 -new_repo=创建新的仓库 +new_repo=创建仓库 new_migrate=迁移外部仓库 new_mirror=创建新的镜像 new_fork=新的仓库Fork -new_org=创建新的组织 +new_org=创建组织 manage_org=管理我的组织 admin_panel=管理后台 account_settings=帐户设置 @@ -693,6 +693,10 @@ issues.filter_sort.recentupdate=最近更新 issues.filter_sort.leastupdate=最少更新 issues.filter_sort.mostcomment=最多评论 issues.filter_sort.leastcomment=最少评论 +issues.filter_sort.moststars=点赞由多到少 +issues.filter_sort.feweststars=点赞由少到多 +issues.filter_sort.mostforks=派生由多到少 +issues.filter_sort.fewestforks=派生由少到多 issues.action_open=开启 issues.action_close=关闭 issues.action_label=标签 @@ -738,7 +742,7 @@ issues.label_deletion_desc=删除标签会将其从所有问题中删除。继 issues.label_deletion_success=该标签已被删除。 issues.label.filter_sort.alphabetically=按字母顺序排序 issues.label.filter_sort.reverse_alphabetically=按字母逆序排序 -issues.label.filter_sort.by_size=大小 +issues.label.filter_sort.by_size=从小到大 issues.label.filter_sort.reverse_by_size=从大到小 issues.num_participants=%d 名参与者 issues.attachment.open_tab=`在新的标签页中查看 '%s'` @@ -1246,14 +1250,14 @@ teams.remove_repo=移除仓库 teams.add_nonexistent_repo=您尝试添加到团队的仓库不存在，请先创建仓库！ [admin] -dashboard=控制面板 +dashboard=管理面板 users=帐户管理 organizations=组织管理 repositories=仓库管理 authentication=认证源 config=应用配置 notices=系统提示 -monitor=应用监控面板 +monitor=监控面板 first_page=首页 last_page=末页 total=总计：%d @@ -1359,8 +1363,9 @@ repos.name=名称 repos.private=私有库 repos.watches=关注数 repos.stars=点赞数 +repos.forks=派生数 repos.issues=工单数 -repos.size=从小到大 +repos.size=大小 auths.auth_manage_panel=认证源管理 auths.new=添加认证源 @@ -1385,6 +1390,7 @@ auths.attribute_username_placeholder=置空将使用Gitea的用户名。 auths.attribute_name=名字属性 auths.attribute_surname=姓氏属性 auths.attribute_mail=电子邮箱属性 +auths.attribute_ssh_public_key=SSH公钥属性 auths.attributes_in_bind=从 Bind DN 中拉取属性信息 auths.use_paged_search=使用分页搜索 auths.search_page_size=分页大小 @@ -1554,11 +1560,11 @@ monitor.name=任务名称 monitor.schedule=任务安排 monitor.next=下次执行时间 monitor.previous=上次执行时间 -monitor.execute_times=执行时间 +monitor.execute_times=执行时长 monitor.process=运行中进程 monitor.desc=进程描述 monitor.start=开始时间 -monitor.execute_time=执行时间 +monitor.execute_time=执行时长 notices.system_notice_list=系统提示管理 notices.view_detail_header=查看提示详情 @@ -1570,7 +1576,7 @@ notices.delete_selected=删除选中项 notices.delete_all=删除所有提示 notices.type=提示类型 notices.type_1=仓库 -notices.desc=进程描述 +notices.desc=提示描述 notices.op=操作 notices.delete_success=系统通知已被删除。 From 3b35c6e47cbb998659c302dcf2594c34e340574c Mon Sep 17 00:00:00 2001 From: David Schneiderbauer Date: Thu, 24 May 2018 20:07:02 +0200 Subject: [PATCH 5/9] add i18n section in config cheat sheet, reordered app.ini.sample (#4038) * add i18n section in config cheat sheet, reordered app.ini.sample * fix wrong default config --- custom/conf/app.ini.sample | 17 +++++------ .../doc/advanced/config-cheat-sheet.en-us.md | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index aad6e9c762..8392576da2 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -571,19 +571,11 @@ MAX_RESPONSE_ITEMS = 50 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 NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어 -[U2F] -; Two Factor authentication with security keys -; https://developers.yubico.com/U2F/App_ID.html -APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s -; Comma seperated list of truisted facets -TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s - - ; Used for datetimepicker [i18n.datelang] en-US = en zh-CN = zh -zh-HK = zh-TW +zh-HK = zh-HK zh-TW = zh-TW de-DE = de fr-FR = fr @@ -604,6 +596,13 @@ sr-SP = sr sv-SE = sv ko-KR = ko +[U2F] +; Two Factor authentication with security keys +; https://developers.yubico.com/U2F/App_ID.html +APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s +; Comma seperated list of truisted facets +TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s + ; Extension mapping to highlight class ; e.g. .toml=ini [highlight.mapping] diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 0d2af62373..b697e5c235 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -278,6 +278,36 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `MAX_GIT_DIFF_FILES`: **100**: Max number of files shown in diff view. - `GC_ARGS`: **\**: Arguments for command `git gc`, e.g. `--aggressive --auto`. +## i18n (`i18n`) + +- `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 +- `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 + +### i18n - Datepicker Language (`i18n.datelang`) +Maps locales to the languages used by the datepicker plugin + +- `en-US`: **en** +- `zh-CN`: **zh** +- `zh-HK`: **zh-HK** +- `zh-TW`: **zh-TW** +- `de-DE`: **de** +- `fr-FR`: **fr** +- `nl-NL`: **nl** +- `lv-LV`: **lv** +- `ru-RU`: **ru** +- `ja-JP`: **ja** +- `es-ES`: **es** +- `pt-BR`: **pt-BR** +- `pl-PL`: **pl** +- `bg-BG`: **bg** +- `it-IT`: **it** +- `fi-FI`: **fi** +- `tr-TR`: **tr** +- `cs-CZ`: **cs-CZ** +- `sr-SP`: **sr** +- `sv-SE`: **sv** +- `ko-KR`: **ko** + ## U2F (`U2F`) - `APP_ID`: **`ROOT_URL`**: Declares the facet of the application. Requires HTTPS. - `TRUSTED_FACETS`: List of additional facets which are trusted. This is not support by all browsers. From 69e82c1761728f5f1288fae204fe16495e829731 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Thu, 24 May 2018 18:08:15 +0000 Subject: [PATCH 6/9] [skip ci] Updated translations via Crowdin --- options/locale/locale_pt-BR.ini | 6 +++--- options/locale/locale_uk-UA.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index d94bbbd494..62429100fe 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -777,9 +777,9 @@ issues.due_date_form_update=Modificar data limite issues.due_date_form_remove=Remover data limite issues.due_date_not_writer=Você deve ter permissão de escrita no repositório para atualizar a data limite de uma issue. issues.due_date_not_set=Data limite não informada. -issues.due_date_added=adicionou a data limite %s à %s -issues.due_date_modified=modificou a data limite para %s ao invés de %s à %s -issues.due_date_remove=removeu a data limite %s à %s +issues.due_date_added=adicionou a data limite %s %s +issues.due_date_modified=modificou a data limite para %s ao invés de %s %s +issues.due_date_remove=removeu a data limite %s %s issues.due_date_overdue=Em atraso pulls.desc=Habilitar solicitações de merge e revisões de código. diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 2228722a98..a9fafcb511 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -570,7 +570,7 @@ issues.opened_by=%[1]s відкрито %[3]s issues.opened_by_fake=%[1]s відкрито %[2]s issues.previous=Попередній issues.next=Далі -issues.open_title=Відкрити +issues.open_title=Відкрито issues.closed_title=Закрито issues.num_comments=%d коментарів issues.commented_at=`прокоментував(ла) %s` From 8ebd15e6a643e17e8f01ab8be51560c663acd010 Mon Sep 17 00:00:00 2001 From: 3_1_3_u Date: Thu, 24 May 2018 22:35:46 +0300 Subject: [PATCH 7/9] fix add a Ukrainian language (#4036) (#4042) --- modules/setting/defaults.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/setting/defaults.go b/modules/setting/defaults.go index f0de54f929..527a6af3b9 100644 --- a/modules/setting/defaults.go +++ b/modules/setting/defaults.go @@ -5,6 +5,6 @@ import ( ) var ( - 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", ",") - 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,한국어", ",") + 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", ",") + 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,한국어", ",") ) From 2a9799493af355a1bff982ce7fe9e73e2964ab64 Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Thu, 24 May 2018 15:51:28 -0400 Subject: [PATCH 8/9] Make home.tmpl visible with Signin-View enabled (#4040) Fix #3846 --- routers/routes/routes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index cb9fbb16aa..15b91f1599 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -168,7 +168,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Head("/", func() string { return "" }) - m.Get("/", ignSignIn, routers.Home) + m.Get("/", routers.Home) m.Group("/explore", func() { m.Get("", func(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/explore/repos") From 2eabf18c9b28336c8d9a89c467b3648bc018d9bb Mon Sep 17 00:00:00 2001 From: David Schneiderbauer Date: Thu, 24 May 2018 22:36:45 +0200 Subject: [PATCH 9/9] add api section to config cheat sheet (#4037) --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index b697e5c235..69f588ebe8 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -278,6 +278,11 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `MAX_GIT_DIFF_FILES`: **100**: Max number of files shown in diff view. - `GC_ARGS`: **\**: Arguments for command `git gc`, e.g. `--aggressive --auto`. +## API (`api`) + +- `ENABLE_SWAGGER_ENDPOINT`: **true**: Enables /api/swagger, /api/v1/swagger etc. endpoints. True or false; default is true. +- `MAX_RESPONSE_ITEMS`: **50**: Max number of items in a page + ## i18n (`i18n`) - `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