Skip to content

Commit

Permalink
Merge branch 'main' into fix-git-legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
wxiaoguang authored Jun 14, 2022
2 parents 64959f0 + 460c03c commit 8a2b4a8
Show file tree
Hide file tree
Showing 32 changed files with 14 additions and 156 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,5 @@ Steven Kriegler <sk.bunsenbrenner@gmail.com> (@justusbunsi)
Jimmy Praet <jimmy.praet@telenet.be> (@jpraet)
Leon Hofmeister <dev.lh@web.de> (@delvh)
Gusted <williamzijl7@hotmail.com) (@Gusted)
singuliere <singuliere@autistici.org> (@singuliere)
silentcode <silentcode@senga.org> (@silentcodeg)
Wim <wim@42.be> (@42wim)
20 changes: 6 additions & 14 deletions modules/context/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -380,24 +380,16 @@ func repoAssignment(ctx *Context, repo *repo_model.Repository) {
ctx.Data["Permission"] = &ctx.Repo.Permission

if repo.IsMirror {

// Check if the mirror has finsihed migrationg, only then we can
// lookup the mirror informtation the database.
finishedMigrating, err := models.HasFinishedMigratingTask(repo.ID)
if err != nil {
ctx.ServerError("HasFinishedMigratingTask", err)
return
}
if finishedMigrating {
ctx.Repo.Mirror, err = repo_model.GetMirrorByRepoID(ctx, repo.ID)
if err != nil {
ctx.ServerError("GetMirrorByRepoID", err)
return
}
ctx.Repo.Mirror, err = repo_model.GetMirrorByRepoID(ctx, repo.ID)
if err == nil {
ctx.Repo.Mirror.Repo = repo
ctx.Data["IsPullMirror"] = true
ctx.Data["MirrorEnablePrune"] = ctx.Repo.Mirror.EnablePrune
ctx.Data["MirrorInterval"] = ctx.Repo.Mirror.Interval
ctx.Data["Mirror"] = ctx.Repo.Mirror
} else if err != repo_model.ErrMirrorNotExist {
ctx.ServerError("GetMirrorByRepoID", err)
return
}
}

Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_bg-BG.ini
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ size_error=` трябва да е с размер %s.`
min_size_error=` трябва да съдържа поне %s знака.`
max_size_error=` трябва да съдържа най-много %s знака.`
email_error=` не е валиден адрес на ел. поща.`
url_error=` не е валиден URL адрес.`
include_error=` трябва да съдържа текст '%s'.`
glob_pattern_error=` glob шаблонът е невалиден: %s`
unknown_error=Неизвестна грешка:
Expand Down Expand Up @@ -644,8 +643,6 @@ issues.label_templates.helper=Изберете набор етикети
issues.label_templates.use=Използвай набор етикети
issues.label_templates.fail_to_load_file=Неуспешно зареждане на шаблон с етикети '%s': %v
issues.deleted_milestone=`(изтрито)`
issues.open_tab=%d отворени
issues.close_tab=%d затворени
issues.filter_label=Етикет
issues.filter_milestone=Етап
issues.filter_assignee=Изпълнител
Expand Down Expand Up @@ -776,8 +773,6 @@ pulls.status_checks_success=Всички проверявания бяха ус


milestones.new=Нов етап
milestones.open_tab=%d отворени
milestones.close_tab=%d затворени
milestones.closed=Затворен %s
milestones.no_due_date=Няма краен срок
milestones.open=Отвори
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_cs-CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,6 @@ size_error=` musí být minimálně velikosti %s.`
min_size_error=` musí obsahovat nejméně %s znaků.`
max_size_error=` musí obsahovat maximálně %s znaků.`
email_error=` není správná e-mailová adresa.`
url_error=` není správná URL.`
include_error=` musí obsahovat řetězec „%s“.`
glob_pattern_error=`zástupný vzor je neplatný: %s.`
regex_pattern_error=` regex vzor je neplatný: %s.`
Expand Down Expand Up @@ -1203,8 +1202,6 @@ issues.change_title_at=`změnil/a název z <b><strike>%s</strike></b> na <b>%s</
issues.remove_ref_at=`odstranil/a referenci <b>%s</b> %s`
issues.add_ref_at=`přidal/a referenci <b>%s</b> %s`
issues.delete_branch_at=`odstranil/a větev <b>%s</b> %s`
issues.open_tab=%d otevřených
issues.close_tab=%d zavřených
issues.filter_label=Štítek
issues.filter_label_exclude=`Chcete-li vyloučit štítky, použijte <code>alt</code> + <code>click/enter</code>`
issues.filter_label_no_select=Všechny štítky
Expand Down Expand Up @@ -1533,8 +1530,6 @@ pulls.merge_instruction_step2_desc=Slučte změny a aktualizujte je na Gitea.


milestones.new=Nový milník
milestones.open_tab=%d otevřených
milestones.close_tab=%d zavřených
milestones.closed=Zavřen dne %s
milestones.update_ago=Aktualizováno před %s
milestones.no_due_date=Bez lhůty dokončení
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_de-DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ size_error=` muss die Größe %s haben.`
min_size_error=` muss mindestens %s Zeichen enthalten.`
max_size_error=` darf höchstens %s Zeichen enthalten.`
email_error=` ist keine gültige E-Mail-Adresse.`
url_error=` ist keine gültige URL.`
include_error=` muss den Text „%s“ enthalten.`
glob_pattern_error=` Der Glob Pattern ist ungültig: %s.`
regex_pattern_error=` regex ist ungültig: %s.`
Expand Down Expand Up @@ -1231,8 +1230,6 @@ issues.change_ref_at=`hat die Referenz von <b><strike>%s</strike></b> zu <b>%s</
issues.remove_ref_at=`hat die Referenz <b>%s</b> entfernt %s`
issues.add_ref_at=`hat die Referenz <b>%s</b> hinzugefügt %s`
issues.delete_branch_at=`löschte die Branch <b>%s</b> %s`
issues.open_tab=%d offen
issues.close_tab=%d geschlossen
issues.filter_label=Label
issues.filter_label_exclude=„<code>Alt</code> + <code>Klick/Enter</code> verwenden, um Label auszuschließen”
issues.filter_label_no_select=Alle Label
Expand Down Expand Up @@ -1562,8 +1559,6 @@ pulls.merge_instruction_step2_desc=Führe die Änderungen zusammen und aktualisi


milestones.new=Neuer Meilenstein
milestones.open_tab=%d offen
milestones.close_tab=%d geschlossen
milestones.closed=Geschlossen %s
milestones.update_ago=Vor %s aktualisiert
milestones.no_due_date=Kein Fälligkeitsdatum
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_el-GR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ size_error=`πρέπει να έχει μέγεθος %s.`
min_size_error=` πρέπει να περιέχει τουλάχιστον %s χαρακτήρες.`
max_size_error=` πρέπει να περιέχει το πολύ %s χαρακτήρες.`
email_error=` δεν είναι έγκυρη διεύθυνση email.`
url_error=` δεν είναι μια έγκυρη διεύθυνση URL.`
include_error=` πρέπει να περιέχει τη σειρά χαρακτήρων '%s'.`
glob_pattern_error=` το μοτίβο ταιριάσματος (glob) δεν είναι έγκυρο: %s.`
regex_pattern_error=` το μοτίβο regex δεν είναι έγκυρο: %s.`
Expand Down Expand Up @@ -1259,8 +1258,6 @@ issues.change_ref_at=`άλλαξε την αναφορά από <b><strike>%s</s
issues.remove_ref_at=`αφαίρεση την αναφορά <b>%s</b> %s`
issues.add_ref_at=`πρόσθεσε την αναφορά <b>%s</b> %s`
issues.delete_branch_at=`διέγραψε το κλάδο <b>%s</b> %s`
issues.open_tab=%d Ανοιχτά
issues.close_tab=%d Κλειστά
issues.filter_label=Σήμα
issues.filter_label_exclude=`Χρησιμοποιήστε <code>alt</code> + <code>κάντε κλικ/Enter</code> για να εξαιρέσετε τις σημάνσεις`
issues.filter_label_no_select=Όλα τα σήματα
Expand Down Expand Up @@ -1604,8 +1601,6 @@ pulls.merge_instruction_step2_desc=Συγχώνευσε τις αλλαγές κ


milestones.new=Νέο Ορόσημο
milestones.open_tab=%d Ανοιχτά
milestones.close_tab=%d Κλειστά
milestones.closed=Έκλεισε %s
milestones.update_ago=Ενημερώθηκε πριν από %s
milestones.no_due_date=Δεν υπάρχει ημερομηνία παράδοσης
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_es-ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@ size_error=` debe ser de tamaño %s.`
min_size_error=` debe contener al menos %s caracteres.`
max_size_error=` debe contener como máximo %s caracteres.`
email_error=` no es una dirección de correo válida.`
url_error=` no es una URL válida.`
include_error=` debe contener la subcadena '%s'.`
glob_pattern_error=` el patrón globo no es válido: %s.`
regex_pattern_error=` el patrón de regex no es válido: %s.`
Expand Down Expand Up @@ -1228,8 +1227,6 @@ issues.change_ref_at=`cambió referencia de <b><strike>%s</strike></b> a <b>%s</
issues.remove_ref_at=`eliminó la referencia <b>%s</b> %s`
issues.add_ref_at=`añadió la referencia <b>%s</b> %s`
issues.delete_branch_at=`rama eliminada <b>%s</b> %s`
issues.open_tab=%d abiertas
issues.close_tab=%d cerradas
issues.filter_label=Etiqueta
issues.filter_label_exclude=`Usa <code>alt</code> + <code>clic/enter</code> para excluir etiquetas`
issues.filter_label_no_select=Todas las etiquetas
Expand Down Expand Up @@ -1559,8 +1556,6 @@ pulls.merge_instruction_step2_desc=Combine los cambios y actualice en Gitea.


milestones.new=Nuevo hito
milestones.open_tab=%d abiertas
milestones.close_tab=%d cerradas
milestones.closed=Cerrada %s
milestones.update_ago=Actualizado hace %s
milestones.no_due_date=Sin fecha límite
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_fa-IR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@ size_error=` باید به اندازه %s باشد.`
min_size_error=` حداقل باید شامل %s کاراکتر باشد.`
max_size_error=` حداکثر باید شامل %s کاراکتر باشد.`
email_error=` ساختار نشانی ایمیل صحیح نیست.`
url_error=` ساختار نشانی اینترنتی صحیح نیست.`
include_error=` باید شامل '%s' باشد.`
glob_pattern_error=`الگوی قطره‌ای (glob) نامعتبر است: %s.`
regex_pattern_error=الگو عبارت باقاعده نامعتبر است: %s
Expand Down Expand Up @@ -1159,8 +1158,6 @@ issues.change_ref_at=`تغییر مرجع از <b> <strike>% s </strike> </b> ب
issues.remove_ref_at=`مرجع حذف <b>% s </b>% s`
issues.add_ref_at=`مرجع اضافه شده <b>% s </b>% s`
issues.delete_branch_at=`حذف شاخه <b>%s</b> %s`
issues.open_tab=%d باز
issues.close_tab=%d بسته
issues.filter_label=برچسب
issues.filter_label_exclude=`از<code>alt</code> + <code>click/enter</code> برای رد کردن برچسب‌ها استفاده کنید `
issues.filter_label_no_select=تمامی برچسب‎ها
Expand Down Expand Up @@ -1482,8 +1479,6 @@ pulls.merge_instruction_step2_desc=تغییرات را ادغام کنید و د


milestones.new=نقطه عطف جدید
milestones.open_tab=%d باز شد
milestones.close_tab=%d بسته
milestones.closed=%s بسته شد
milestones.update_ago=آخرین بروز رسانی %s قبل
milestones.no_due_date=بدون موعد مقرر
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_fi-FI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ size_error=` täytyy olla kokoa %s.`
min_size_error=` täytyy sisältää vähintään %s merkkiä.`
max_size_error=` täytyy sisältää enintään %s merkkiä.`
email_error=` ei ole kelvollinen sähköpostiosoite.`
url_error=` ei ole kelvollinen URL.`
include_error=` täytyy sisältää tekstiosa '%s'.`
unknown_error=Tuntematon virhe:
password_not_match=Salasanat eivät täsmää.
Expand Down Expand Up @@ -631,8 +630,6 @@ issues.add_milestone_at=`lisäsi tämän merkkipaaluun <b>%s</b> %s`
issues.deleted_milestone=`(poistettu)`
issues.self_assign_at=`itse otti tämän käsittelyyn %s`
issues.delete_branch_at=`poisti haaran <b>%s</b> %s`
issues.open_tab=%d avoinna
issues.close_tab=%d suljettu
issues.filter_label=Tunniste
issues.filter_label_exclude=`Käytä <code>alt</code> + <code>klikkaus/rivinvaihto</code> poissulkeaksesi tunnisteita`
issues.filter_label_no_select=Kaikki tunnisteet
Expand Down Expand Up @@ -761,8 +758,6 @@ pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti


milestones.new=Uusi merkkipaalu
milestones.open_tab=%d avoinna
milestones.close_tab=%d suljettu
milestones.closed=Suljettu %s
milestones.no_due_date=Ei määräpäivää
milestones.open=Avaa uudelleen
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_fr-FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ size_error=` doit être à la taille de %s.`
min_size_error=` %s caractères minimum `
max_size_error=` %s caractères maximum `
email_error=` adresse e-mail invalide `
url_error=` URL invalide `
include_error=`doit contenir la sous-chaîne '%s'.`
glob_pattern_error=` le motif de développement est invalide : %s.`
unknown_error=Erreur inconnue :
Expand Down Expand Up @@ -1093,8 +1092,6 @@ issues.remove_assignee_at=`mis en non assigné par <b>%s</b> %s`
issues.remove_self_assignment=`a retiré son assignation %s`
issues.change_title_at=`a modifié le titre de <b><strike>%s</strike></b> à <b>%s</b> %s`
issues.delete_branch_at=`a supprimé la branche <b>%s</b> %s`
issues.open_tab=%d Ouvert
issues.close_tab=%d Fermé
issues.filter_label=Étiquette
issues.filter_label_exclude=`Utiliser <code>alt</code> + <code>clic/entrée</code> pour exclure les étiquettes`
issues.filter_label_no_select=Toutes les étiquettes
Expand Down Expand Up @@ -1395,8 +1392,6 @@ pulls.merge_instruction_step2_desc=Fusionner les modifications et mettre à jour


milestones.new=Nouveau jalon
milestones.open_tab=%d Ouvert
milestones.close_tab=%d Fermé
milestones.closed=%s fermé
milestones.update_ago=Mis à jour il y a %s
milestones.no_due_date=Aucune date d'échéance
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_hu-HU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ size_error=` %s méretűnek kell lennie.`
min_size_error=` legalább %s karaktert kell tartalmaznia.`
max_size_error=` legfeljebb %s karaktert tartalmazhat.`
email_error=` nem valódi e-mail cím.`
url_error=` nem érvényes URL.`
include_error=` tartalmaznia kell a '%s' karakterláncot.`
unknown_error=Ismeretlen hiba:
captcha_incorrect=Helytelen kódot adtál meg.
Expand Down Expand Up @@ -810,8 +809,6 @@ issues.add_assignee_at=`hozzárendelve <b>%s</b> által %s`
issues.remove_assignee_at=`hozzárendelés törlése <b>%s</b> által %s`
issues.remove_self_assignment=`eltávolította a hozzárendelést %s`
issues.delete_branch_at=`letörölte a(z) <b>%s</b> ágat %s`
issues.open_tab=%d Nyitva
issues.close_tab=%d Lezárva
issues.filter_label=Címke
issues.filter_label_no_select=Minden címke
issues.filter_milestone=Mérföldkő
Expand Down Expand Up @@ -980,8 +977,6 @@ pulls.status_checks_success=Minden ellenőrzés sikeres volt


milestones.new=Új mérföldkő
milestones.open_tab=%d Nyitott
milestones.close_tab=%d Zárt
milestones.closed=Lezárva: %s
milestones.no_due_date=Nincs határidő
milestones.open=Megnyitás
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_id-ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ size_error=` harus berukuran %s.`
min_size_error=` harus berisi karakter %s setidaknya.`
max_size_error=` harus mengandung paling banyak %s karakter.`
email_error=` bukan alamat surel yang valid. `
url_error=` bukan URL yang valid.`
include_error=` harus mengandung substring '%s'.`
glob_pattern_error=` pola glob salah: %s.`
unknown_error=Kesalahan yang tidak diketahui:
Expand Down Expand Up @@ -753,8 +752,6 @@ issues.deleted_milestone=`(dihapus)`
issues.self_assign_at=`menugaskan diri %s`
issues.add_assignee_at=`telah ditugaskan oleh <b>%s</b> %s`
issues.delete_branch_at=`telah dihapus cabang <b>%s</b> %s`
issues.open_tab=%d Terbuka
issues.close_tab=%d Tertutup
issues.filter_label=Label
issues.filter_milestone=Tonggak
issues.filter_assignee=Menerima
Expand Down Expand Up @@ -845,8 +842,6 @@ pulls.can_auto_merge_desc=Permintaan tarik ini dapat digabung secara otomatis.


milestones.new=Milestone Baru
milestones.open_tab=%d Terbuka
milestones.close_tab=%d Tertutup
milestones.closed=Tertutup %s
milestones.no_due_date=Tidak ada jatuh tempo
milestones.open=Buka
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_is-IS.ini
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ require_error=` Getur ekki verið tómt.`
alpha_dash_dot_error=` ætti aðeins að innihalda tölustafi, strik ('-'), undirstrik ('_') og punkta ('.').`
size_error=` þarf að vera stærð %s.`
email_error=` er ekki gilt netfang.`
url_error=` er ekki gild vefslóð.`
unknown_error=Óþekkt villa:
captcha_incorrect=CAPTCHA kóðinn er rangur.
password_not_match=Lykilorðin passa ekki saman.
Expand Down Expand Up @@ -779,8 +778,6 @@ issues.new_label_placeholder=Lýsingarheiti
issues.new_label_desc_placeholder=Lýsing
issues.create_label=Skapa Lýsingu
issues.label_templates.info=Engin merki eru til ennþá. Búðu til merki með „Nýtt merki“ eða notaðu fyrirfram skilgreint merkisett:
issues.open_tab=%d Opin
issues.close_tab=%d Lokuð
issues.filter_label=Lýsing
issues.filter_label_no_select=Allar lýsingar
issues.filter_milestone=Tímamót
Expand Down Expand Up @@ -934,8 +931,6 @@ pulls.status_checks_details=Nánar


milestones.new=Nýtt tímamót
milestones.open_tab=%d Opin
milestones.close_tab=%d Lokuð
milestones.closed=Lokaði %s
milestones.update_ago=Uppfært fyrir %s
milestones.no_due_date=Enginn eindagi
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_it-IT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ size_error='deve essere %s.'
min_size_error=` deve contenere almeno %s caratteri.`
max_size_error=` deve contenere massimo %s caratteri.`
email_error=` non è un indirizzo e-mail valido.`
url_error=` non è un URL valido.`
include_error=` deve contenere la stringa '%s'.`
glob_pattern_error=` il pattern glob non è valido: %s.`
unknown_error=Errore sconosciuto:
Expand Down Expand Up @@ -986,8 +985,6 @@ issues.remove_assignee_at=`è stato rimosso da <b>%s</b> %s`
issues.remove_self_assignment=`Rimosso il loro incarico %s`
issues.change_title_at=`Titolo modificato da <b><strike>%s</strike></b> a <b>%s</b> %s`
issues.delete_branch_at=`branch <b>%s</b> eliminato %s`
issues.open_tab=%d Aperti
issues.close_tab=%d Chiusi
issues.filter_label=Etichetta
issues.filter_label_exclude=`Usa <code>alt</code> + <code>click/enter</code> per escludere le etichette`
issues.filter_label_no_select=Tutte le etichette
Expand Down Expand Up @@ -1252,8 +1249,6 @@ pulls.outdated_with_base_branch=Questo brench non è aggiornato con il branch di
milestones.new=Nuova Milestone
milestones.open_tab=%d Aperti
milestones.close_tab=%d Chiusi
milestones.closed=Chiuso %s
milestones.update_ago=Aggiornato %s fa
milestones.no_due_date=Nessuna data di scadenza
Expand Down
5 changes: 0 additions & 5 deletions options/locale/locale_ja-JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ size_error=は%s文字である必要があります。
min_size_error=`は%s文字以上である必要があります。`
max_size_error=`は%s文字以下である必要があります。`
email_error=`は有効なメールアドレスではありません。`
url_error=`は有効なURLではありません。`
include_error=`は文字列 '%s' を含んでいる必要があります。`
glob_pattern_error=`のglobパターンが不正です: %s.`
regex_pattern_error=`の正規表現パターンが不正です: %s.`
Expand Down Expand Up @@ -1259,8 +1258,6 @@ issues.change_ref_at=`が参照を <b><strike>%s</strike></b> から <b>%s</b>
issues.remove_ref_at=`が参照 <b>%s</b> を削除 %s`
issues.add_ref_at=`が参照 <b>%s</b> を追加 %s`
issues.delete_branch_at=`がブランチ <b>%[1]s</b> を削除 %[2]s`
issues.open_tab=%d件 オープン中
issues.close_tab=%d件 クローズ済
issues.filter_label=ラベル
issues.filter_label_exclude=`ラベルで除外するには <code>alt</code> + <code>click/enter</code>`
issues.filter_label_no_select=すべてのラベル
Expand Down Expand Up @@ -1604,8 +1601,6 @@ pulls.merge_instruction_step2_desc=変更内容をマージして、Giteaに反


milestones.new=新しいマイルストーン
milestones.open_tab=%d件 オープン中
milestones.close_tab=%d件 クローズ済
milestones.closed=%s にクローズ
milestones.update_ago=%s 前に更新
milestones.no_due_date=期日なし
Expand Down
Loading

0 comments on commit 8a2b4a8

Please sign in to comment.