From 83d956ce6b22bb066607c3a2da2e265b7b034e6f Mon Sep 17 00:00:00 2001 From: Barbossa Date: Wed, 6 Jun 2018 22:02:37 +0800 Subject: [PATCH 1/5] Fix typo (#4151) Fix incorrect tmpl in oauth when we have a custom authorize url. The tmpl will append an additional character "v" every time we save the settings. --- templates/admin/auth/edit.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 39d1f9a70..5c492ff52 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -191,7 +191,7 @@
- +
From e5fd43c231ed1884f491db14183427f1b0ec7bc0 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Wed, 6 Jun 2018 14:04:02 +0000 Subject: [PATCH 2/5] [skip ci] Updated translations via Crowdin --- options/locale/locale_uk-UA.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 7b0a75b7e..c466e9632 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -348,6 +348,7 @@ subkeys=Підключі key_id=ID ключа key_name=Ім'я ключа key_content=Зміст +add_key_success=SSH ключ '%s' додано. delete_key=Видалити ssh_key_deletion=Видалити SSH ключ gpg_key_deletion=Видалити GPG ключ @@ -658,6 +659,8 @@ pulls.has_merged=Запит на злиття було об'єднано. pulls.can_auto_merge_desc=Цей запит можна об'єднати автоматично. pulls.cannot_auto_merge_desc=Цей запит на злиття не може бути злитий автоматично через конфлікти. pulls.cannot_auto_merge_helper=Злийте вручну для вирішення конфліктів. +pulls.no_merge_desc=Цей запити на злиття неможливо злити, оскільки всі параметри об'єднання репозиторія вимкнено. +pulls.no_merge_helper=Увімкніть параметри злиття в налаштуваннях репозиторія або злийте запити на злиття вручну. pulls.merge_pull_request=Об'єднати запит на злиття pulls.rebase_merge_pull_request=Зробити Rebase і злити pulls.squash_merge_pull_request=Об'єднати (Squash) і злити From a89d6253e081923ad26e2303f8c543c53c9ed39c Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Thu, 7 Jun 2018 02:13:42 +0300 Subject: [PATCH 3/5] Show only needed values in database configuration section depending on type (#4164) --- options/locale/locale_en-US.ini | 2 -- templates/admin/config.tmpl | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f2862bde8..e510e9954 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1475,9 +1475,7 @@ config.db_host = Host config.db_name = Name config.db_user = Username config.db_ssl_mode = SSL -config.db_ssl_mode_helper = (for "postgres" only) config.db_path = Path -config.db_path_helper = (for "sqlite3" and "tidb") config.service_config = Service Configuration config.register_email_confirm = Require Email Confirmation to Register diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index d8292a9e6..21aa8756f 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -92,16 +92,22 @@
{{.i18n.Tr "admin.config.db_type"}}
{{.DbCfg.Type}}
+ {{if not (or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb"))}}
{{.i18n.Tr "admin.config.db_host"}}
{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}
{{.i18n.Tr "admin.config.db_name"}}
{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}
{{.i18n.Tr "admin.config.db_user"}}
{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}
+ {{end}} + {{if eq .DbCfg.Type "postgres"}}
{{.i18n.Tr "admin.config.db_ssl_mode"}}
-
{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}} {{.i18n.Tr "admin.config.db_ssl_mode_helper"}}
+
{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}
+ {{end}} + {{if or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb")}}
{{.i18n.Tr "admin.config.db_path"}}
-
{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}} {{.i18n.Tr "admin.config.db_path_helper"}}
+
{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}
+ {{end}}
From c9c5d164d57b44728acb0dd9068a535814ecae7b Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Thu, 7 Jun 2018 21:23:39 -0400 Subject: [PATCH 4/5] Add myself as a maintainer (#4172) --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0150e8370..5deb40961 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22,3 +22,4 @@ Peter Žeby (@morlinest) Matti Ranta (@techknowlogick) Michael Lustfield (@MTecknology) Jonas Franz (@JonasFranzDEV) +Flynn Lufmons (@flufmonster) From 3fbba2553a615efbda3f5b28a585a71824c84cc8 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Fri, 8 Jun 2018 01:24:38 +0000 Subject: [PATCH 5/5] [skip ci] Updated translations via Crowdin --- options/locale/locale_bg-BG.ini | 2 -- options/locale/locale_cs-CZ.ini | 2 -- options/locale/locale_de-DE.ini | 2 -- options/locale/locale_es-ES.ini | 2 -- options/locale/locale_fi-FI.ini | 2 -- options/locale/locale_fr-FR.ini | 2 -- options/locale/locale_hu-HU.ini | 2 -- options/locale/locale_id-ID.ini | 2 -- options/locale/locale_it-IT.ini | 2 -- options/locale/locale_ja-JP.ini | 2 -- options/locale/locale_ko-KR.ini | 2 -- options/locale/locale_lv-LV.ini | 2 -- options/locale/locale_nl-NL.ini | 2 -- options/locale/locale_pl-PL.ini | 2 -- options/locale/locale_pt-BR.ini | 2 -- options/locale/locale_ru-RU.ini | 2 -- options/locale/locale_sr-SP.ini | 2 -- options/locale/locale_sv-SE.ini | 2 -- options/locale/locale_tr-TR.ini | 2 -- options/locale/locale_uk-UA.ini | 2 -- options/locale/locale_zh-CN.ini | 2 -- options/locale/locale_zh-HK.ini | 2 -- options/locale/locale_zh-TW.ini | 2 -- 23 files changed, 46 deletions(-) diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini index 49b0bda05..810e8d471 100644 --- a/options/locale/locale_bg-BG.ini +++ b/options/locale/locale_bg-BG.ini @@ -606,9 +606,7 @@ config.db_config=Настройки на базата данни config.db_type=Тип config.db_host=Сървър config.db_name=Име -config.db_ssl_mode_helper=(само за postgres) config.db_path=Път -config.db_path_helper=(за "sqlite3" и "tidb") config.service_config=Настройка на услугата config.show_registration_button=Покажи бутон за регистрация diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 81a561729..818611ee2 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -603,9 +603,7 @@ config.db_config=Nastavení databáze config.db_type=Typ config.db_host=Server config.db_name=Název -config.db_ssl_mode_helper=(pouze pro 'postgres') config.db_path=Cesta -config.db_path_helper=(pro "sqlite3" a "tidb") config.service_config=Nastavení služby config.show_registration_button=Ukázat tlačítko registrace diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 68fc99a84..d3e3a8098 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1472,9 +1472,7 @@ config.db_host=Host config.db_name=Name config.db_user=Benutzername config.db_ssl_mode=SSL -config.db_ssl_mode_helper=(nur für "postgres") config.db_path=Verzeichnis -config.db_path_helper=(für "sqlite3" und "tidb") config.service_config=Service-Konfiguration config.register_email_confirm=E-Mail-Bestätigung benötigt zum Registrieren diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 751cbd44d..5f05cce65 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -741,9 +741,7 @@ config.ssh_minimum_key_sizes=Tamaños de clave mínimos config.db_config=Configuración de la Base de Datos config.db_type=Tipo config.db_name=Nombre -config.db_ssl_mode_helper=(sólo para "postgres") config.db_path=Ruta -config.db_path_helper=(para "sqlite3" y "tidb") config.service_config=Configuración del servicio config.show_registration_button=Mostrar Botón de Registro diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index a0c76dd6c..aefe26919 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -585,9 +585,7 @@ config.db_config=Tietokannan asetukset config.db_type=Tyyppi config.db_host=Isäntä config.db_name=Nimi -config.db_ssl_mode_helper=(vain "postgres") config.db_path=Polku -config.db_path_helper=("sqlite3" ja "tidb") config.service_config=Palvelu asetukset config.show_registration_button=Näytä rekisteröidy painike diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index c22916dff..91961719e 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -818,9 +818,7 @@ config.db_config=Configuration de la base de données config.db_type=Type config.db_host=Hôte config.db_name=Nom -config.db_ssl_mode_helper=("postgres" uniquement) config.db_path=Emplacement -config.db_path_helper=(pour « sqlite3 » et « TIDB ») config.service_config=Configuration du service config.show_registration_button=Afficher le bouton d'enregistrement diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 450ae826c..b52f8f840 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -835,9 +835,7 @@ config.db_config=Adatbázis Konfiguráció config.db_type=Típus config.db_host=Kiszolgáló config.db_name=Név -config.db_ssl_mode_helper=(csak "postgres"-nek) config.db_path=Elérési út -config.db_path_helper=("sqlite3" és "tidb"-nek) config.service_config=Szolgáltatás konfiguráció config.show_registration_button=Regisztráció gomb megjelenítése diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index fb2b261e3..b6999654f 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -807,9 +807,7 @@ config.ssh_minimum_key_sizes=Ukuran kunci minimum config.db_config=Konfigurasi basis data config.db_name=Nama -config.db_ssl_mode_helper=(untuk "postgres" saja) config.db_path=Jalur -config.db_path_helper=(untuk "sqlite3 dan "tidb") config.service_config=Konfigurasi layanan config.show_registration_button=Tampilkan tombol mendaftar diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index af9acccaa..9ea365639 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -638,9 +638,7 @@ config.ssh_minimum_key_sizes=Dimensioni minime della chiave config.db_config=Configurazione Database config.db_type=Tipo config.db_name=Nome -config.db_ssl_mode_helper=(solo per "postgres") config.db_path=Percorso -config.db_path_helper=(per "sqlite3" e "tidb") config.service_config=Configurazione Servizio config.show_registration_button=Mostra Pulsane Registrazione diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 557110b1f..3c422034e 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -833,9 +833,7 @@ config.db_config=データベースの構成 config.db_type=タイプ config.db_host=ホスト config.db_name=名前 -config.db_ssl_mode_helper=(「postgres」のみ） config.db_path=パス -config.db_path_helper=("sqlite3"および"tidb"のみ) config.service_config=サービスの構成 config.show_registration_button=登録ボタンを表示します。 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index eb17fab5d..cd4528ffb 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -687,9 +687,7 @@ config.db_config=데이터베이스 설정 config.db_type=유형 config.db_host=호스트 config.db_name=이름 -config.db_ssl_mode_helper=("postgres" 전용) config.db_path=경로 -config.db_path_helper=("sqlite3" 및 "tidb"만) config.service_config=서비스 설정 config.show_registration_button=등록 버튼을 표시 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index d2f34e08b..656910dc8 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -833,9 +833,7 @@ config.db_config=Datu bāzes konfigurācija config.db_type=Veids config.db_host=Resursdators config.db_name=Nosaukums -config.db_ssl_mode_helper=(tikai PostgreSQL datu bāzei) config.db_path=Ceļš -config.db_path_helper=(priekš "sqlite3" and "tidb") config.service_config=Pakalpojuma konfigurācija config.show_registration_button=Rādīt reģistrēšanās pogu diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 6815ce6c3..6b96b91de 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -784,9 +784,7 @@ config.db_config=Databaseconfiguratie config.db_type=Type config.db_host=Host config.db_name=Naam -config.db_ssl_mode_helper=(alleen voor "postgres") config.db_path=Pad -config.db_path_helper=(voor "sqlite3" en "tidb") config.service_config=Serviceconfiguratie config.show_registration_button=Registeren knop weergeven diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 7ed8b4715..954a37f5f 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -816,9 +816,7 @@ config.db_config=Konfiguracja bazy danych config.db_type=Typ config.db_host=Serwer config.db_name=Nazwa -config.db_ssl_mode_helper=(tylko dla „postgres”) config.db_path=Ścieżka -config.db_path_helper=(dla „sqlite3” i „tidb”) config.service_config=Konfiguracja usługi config.show_registration_button=Pokazuj przycisk rejestracji diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 62429100f..17b59f7b1 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -1475,9 +1475,7 @@ config.db_host=Servidor config.db_name=Nome config.db_user=Nome de usuário config.db_ssl_mode=SSL -config.db_ssl_mode_helper=(apenas para "postgres") config.db_path=Caminho -config.db_path_helper=(para "sqlite3" e "tidb") config.service_config=Configuração do serviço config.register_email_confirm=Exigir confirmação de e-mail para se cadastrar diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index ad480edc2..a8cf3098b 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1475,9 +1475,7 @@ config.db_host=Сервер config.db_name=Имя config.db_user=Пользователь config.db_ssl_mode=SSL -config.db_ssl_mode_helper=(только для "postgres") config.db_path=Путь -config.db_path_helper=(для "sqlite3" и "tidb") config.service_config=Сервисная конфигурация config.register_email_confirm=Требуется подтверждение по электронной почте diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini index fa8430e7a..3acc22c3a 100644 --- a/options/locale/locale_sr-SP.ini +++ b/options/locale/locale_sr-SP.ini @@ -601,9 +601,7 @@ config.db_config=Конфигурација базе података config.db_type=Тип config.db_host=Хост config.db_name=Име -config.db_ssl_mode_helper=(само за postgres) config.db_path=Пут -config.db_path_helper=(за "sqlite3" и "tidb") config.service_config=Подешавања сервиса config.show_registration_button=Прикажи дугме за регистрацију diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index b735943f6..e6bb938a5 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -738,9 +738,7 @@ config.db_config=Databaskonfiguration config.db_type=Typ config.db_host=Värd config.db_name=Namn -config.db_ssl_mode_helper=(endast för "postgres") config.db_path=Sökväg -config.db_path_helper=(för "sqlite3" och "tidb") config.service_config=Tjänstkonfiguration config.show_registration_button=Visa registreringsknapp diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 4e33fad25..f3ed0f727 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -802,9 +802,7 @@ config.db_config=Veritabanı Yapılandırması config.db_type=Türü config.db_host=Sunucu config.db_name=İsim -config.db_ssl_mode_helper=(sadece "postgres" için) config.db_path=Yol -config.db_path_helper=("sqlite3" ve "tidb" için) config.service_config=Servis Yapılandırması config.show_registration_button=Kaydolma Tuşunu Göster diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index c466e9632..4d431d711 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -1148,9 +1148,7 @@ config.db_host=Хост config.db_name=Ім'я config.db_user=Ім'я кристувача config.db_ssl_mode=SSL -config.db_ssl_mode_helper=(тільки для "postgres") config.db_path=Шлях -config.db_path_helper=(для "sqlite3" і "tidb") config.service_config=Конфігурація сервісу config.register_email_confirm=Потрібно підтвердити електронну пошту для реєстрації diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index b57eeed1a..8b23e404c 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1475,9 +1475,7 @@ config.db_host=主机 config.db_name=数据库名称 config.db_user=用户名 config.db_ssl_mode=SSL -config.db_ssl_mode_helper=（仅限 "postgres" 使用） config.db_path=数据库路径 -config.db_path_helper=（用于 "sqlite3" 和 "tidb"） config.service_config=服务配置 config.register_email_confirm=需要电子邮件确认注册 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 75d6a2db5..a64367d39 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -737,9 +737,7 @@ config.db_config=資料庫設定 config.db_type=資料庫類型 config.db_host=主機地址 config.db_name=資料庫名稱 -config.db_ssl_mode_helper=（僅限 "postgres" 使用） config.db_path=資料庫路徑 -config.db_path_helper=（用於 "sqlite3" 和 "tidb"） config.service_config=服務設定 config.show_registration_button=顯示註冊按鈕 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index fbe418a7d..fa716b27d 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -808,9 +808,7 @@ config.db_config=資料庫設定 config.db_type=資料庫類型 config.db_host=主機地址 config.db_name=資料庫名稱 -config.db_ssl_mode_helper=（僅限 "postgres" 使用） config.db_path=資料庫路徑 -config.db_path_helper=（用於 "sqlite3" 和 "tidb"） config.service_config=服務設定 config.show_registration_button=顯示註冊按鈕