Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into types-8
Browse files Browse the repository at this point in the history
* origin/main:
  Fix internal server error when updating labels without write permission (go-gitea#32776)
  Fix wiki ui (go-gitea#32781)
  Change typescript `module` to `nodenext` (go-gitea#32757)
  Refactor issue filter (labels, poster, assignee) (go-gitea#32771)
  Make RepoActionView.vue support `##[group]` (go-gitea#32770)
  [skip ci] Updated translations via Crowdin
  • Loading branch information
silverwind committed Dec 10, 2024
2 parents 206a6f4 + 2ac6f2b commit ac5c054
Show file tree
Hide file tree
Showing 27 changed files with 467 additions and 358 deletions.
13 changes: 8 additions & 5 deletions modules/templates/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func NewFuncMap() template.FuncMap {
"HTMLFormat": htmlutil.HTMLFormat,
"HTMLEscape": htmlEscape,
"QueryEscape": queryEscape,
"QueryBuild": queryBuild,
"QueryBuild": QueryBuild,
"JSEscape": jsEscapeSafe,
"SanitizeHTML": SanitizeHTML,
"URLJoin": util.URLJoin,
Expand Down Expand Up @@ -294,24 +294,27 @@ func timeEstimateString(timeSec any) string {
return util.TimeEstimateString(v)
}

func queryBuild(a ...any) template.URL {
// QueryBuild builds a query string from a list of key-value pairs.
// It omits the nil and empty strings, but it doesn't omit other zero values,
// because the zero value of number types may have a meaning.
func QueryBuild(a ...any) template.URL {
var s string
if len(a)%2 == 1 {
if v, ok := a[0].(string); ok {
if v == "" || (v[0] != '?' && v[0] != '&') {
panic("queryBuild: invalid argument")
panic("QueryBuild: invalid argument")
}
s = v
} else if v, ok := a[0].(template.URL); ok {
s = string(v)
} else {
panic("queryBuild: invalid argument")
panic("QueryBuild: invalid argument")
}
}
for i := len(a) % 2; i < len(a); i += 2 {
k, ok := a[i].(string)
if !ok {
panic("queryBuild: invalid argument")
panic("QueryBuild: invalid argument")
}
var v string
if va, ok := a[i+1].(string); ok {
Expand Down
5 changes: 3 additions & 2 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ delete_preexisting_success = Deleted unadopted files in %s
blame_prior = View blame prior to this change
blame.ignore_revs = Ignoring revisions in <a href="%s">.git-blame-ignore-revs</a>. Click <a href="%s">here to bypass</a> and see the normal blame view.
blame.ignore_revs.failed = Failed to ignore revisions in <a href="%s">.git-blame-ignore-revs</a>.
author_search_tooltip = Shows a maximum of 30 users
user_search_tooltip = Shows a maximum of 30 users
tree_path_not_found_commit = Path %[1]s doesn't exist in commit %[2]s
tree_path_not_found_branch = Path %[1]s doesn't exist in branch %[2]s
Expand Down Expand Up @@ -1529,7 +1529,8 @@ issues.filter_assignee = Assignee
issues.filter_assginee_no_select = All assignees
issues.filter_assginee_no_assignee = No assignee
issues.filter_poster = Author
issues.filter_poster_no_select = All authors
issues.filter_user_placeholder = Search users
issues.filter_user_no_select = All users
issues.filter_type = Type
issues.filter_type.all_issues = All issues
issues.filter_type.assigned_to_you = Assigned to you
Expand Down
27 changes: 26 additions & 1 deletion options/locale/locale_fr-FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ confirm_delete_selected=Êtes-vous sûr de vouloir supprimer tous les éléments
name=Nom
value=Valeur
readme=Lisez-moi
filter=Filtrer
filter.clear=Effacer le filtre
Expand Down Expand Up @@ -1032,6 +1033,8 @@ fork_to_different_account=Créer une bifurcation vers un autre compte
fork_visibility_helper=La visibilité d'un dépôt bifurqué ne peut pas être modifiée.
fork_branch=Branche à cloner sur la bifurcation
all_branches=Toutes les branches
view_all_branches=Voir toutes les branches
view_all_tags=Voir toutes les étiquettes
fork_no_valid_owners=Ce dépôt ne peut pas être bifurqué car il n’a pas de propriétaire valide.
fork.blocked_user=Impossible de bifurquer le dépôt car vous êtes bloqué par son propriétaire.
use_template=Utiliser ce modèle
Expand All @@ -1043,6 +1046,8 @@ generate_repo=Générer un dépôt
generate_from=Générer depuis
repo_desc=Description
repo_desc_helper=Décrire brièvement votre dépôt
repo_no_desc=Aucune description fournie
repo_lang=Langue
repo_gitignore_helper=Sélectionner quelques .gitignore prédéfinies
repo_gitignore_helper_desc=De nombreux outils et compilateurs génèrent des fichiers résiduels qui n'ont pas besoin d'être supervisés par git. Composez un .gitignore à l’aide de cette liste des languages de programmation courants.
issue_labels=Jeu de labels pour les tickets
Expand Down Expand Up @@ -1668,12 +1673,26 @@ issues.delete.title=Supprimer ce ticket ?
issues.delete.text=Voulez-vous vraiment supprimer ce ticket ? (Cette opération supprimera définitivement tout le contenu. Envisagez plutôt de le fermer si vous avez l'intention de l'archiver)
issues.tracker=Minuteur
issues.timetracker_timer_start=Démarrer le minuteur
issues.timetracker_timer_stop=Arrêter le minuteur
issues.timetracker_timer_discard=Annuler le minuteur
issues.timetracker_timer_manually_add=Pointer du temps
issues.time_estimate_placeholder=1h 2m
issues.time_estimate_set=Définir le temps estimé
issues.time_estimate_display=Estimation : %s
issues.change_time_estimate_at=a changé le temps estimé à <b>%s</b> %s
issues.remove_time_estimate_at=a supprimé le temps estimé %s
issues.time_estimate_invalid=Le format du temps estimé est invalide
issues.start_tracking_history=`a commencé son travail %s.`
issues.tracker_auto_close=Le minuteur sera automatiquement arrêté quand le ticket sera fermé.
issues.tracking_already_started=`Vous avez déjà un minuteur en cours sur <a href="%s">un autre ticket</a> !`
issues.stop_tracking_history=`a fini de travailler sur <b>%s</b> %s.`
issues.cancel_tracking_history=`a abandonné son minuteur %s.`
issues.del_time=Supprimer ce minuteur du journal
issues.add_time_history=`a pointé du temps de travail %s.`
issues.del_time_history=`a supprimé son temps de travail %s.`
issues.add_time_manually=Temps pointé manuellement
issues.add_time_hours=Heures
issues.add_time_minutes=Minutes
issues.add_time_sum_to_small=Aucun minuteur n'a été saisi.
Expand Down Expand Up @@ -1926,6 +1945,10 @@ pulls.delete.title=Supprimer cette demande d'ajout ?
pulls.delete.text=Voulez-vous vraiment supprimer cet demande d'ajout ? (Cela supprimera définitivement tout le contenu. Envisagez de le fermer à la place, si vous avez l'intention de le garder archivé)
pulls.recently_pushed_new_branches=Vous avez soumis sur la branche <strong>%[1]s</strong> %[2]s
pulls.upstream_diverging_prompt_behind_1=Cette branche est en retard de %d révision sur %s
pulls.upstream_diverging_prompt_behind_n=Cette branche est en retard de %d révisions sur %s
pulls.upstream_diverging_prompt_base_newer=La branche de base %s a de nouveaux changements
pulls.upstream_diverging_merge=Synchroniser la bifurcation
pull.deleted_branch=(supprimé) : %s
pull.agit_documentation=Voir la documentation sur AGit
Expand Down Expand Up @@ -3513,6 +3536,8 @@ alpine.repository=Informations sur le Dépôt
alpine.repository.branches=Branches
alpine.repository.repositories=Dépôts
alpine.repository.architectures=Architectures
arch.registry=Ajouter un serveur avec un dépôt et une architecture liés dans <code>/etc/pacman.conf</code> :
arch.install=Synchroniser le paquet avec pacman :
arch.repository=Informations sur le Dépôt
arch.repository.repositories=Dépôts
arch.repository.architectures=Architectures
Expand Down
27 changes: 26 additions & 1 deletion options/locale/locale_ga-IE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ confirm_delete_selected=Deimhnigh chun gach earra roghnaithe a scriosadh?
name=Ainm
value=Luach
readme=Readme
filter=Scagaire
filter.clear=Scagaire Soiléir
Expand Down Expand Up @@ -1032,6 +1033,8 @@ fork_to_different_account=Forc chuig cuntas difriúil
fork_visibility_helper=Ní féidir infheictheacht stór forcailte a athrú.
fork_branch=Brainse le clónú chuig an bhforc
all_branches=Gach brainse
view_all_branches=Féach ar gach brainse
view_all_tags=Féach ar gach clib
fork_no_valid_owners=Ní féidir an stór seo a fhorcáil toisc nach bhfuil úinéirí bailí ann.
fork.blocked_user=Ní féidir an stór a fhorcáil toisc go bhfuil úinéir an stórais bac ort.
use_template=Úsáid an teimpléad seo
Expand All @@ -1043,6 +1046,8 @@ generate_repo=Cruthaigh Stóras
generate_from=Gin Ó
repo_desc=Cur síos
repo_desc_helper=Cuir isteach tuairisc ghearr (roghnach)
repo_no_desc=Níor tugadh tuairisc
repo_lang=Teangacha
repo_gitignore_helper=Roghnaigh teimpléid .gitignore.
repo_gitignore_helper_desc=Roghnaigh na comhaid nach bhfuil le rianú ó liosta teimpléid do theangacha coitianta. Cuirtear déantáin tipiciúla a ghineann uirlisí tógála gach teanga san áireamh ar.gitignore de réir réamhshocraithe.
issue_labels=Lipéid Eisiúna
Expand Down Expand Up @@ -1668,12 +1673,26 @@ issues.delete.title=Scrios an t-eagrán seo?
issues.delete.text=An bhfuil tú cinnte gur mhaith leat an cheist seo a scriosadh? (Bainfidh sé seo an t-inneachar go léir go buan. Smaoinigh ar é a dhúnadh ina ionad sin, má tá sé i gceist agat é a choinneáil i gcartlann)

issues.tracker=Rianaitheoir Ama

issues.timetracker_timer_start=Amadóir tosaithe
issues.timetracker_timer_stop=Stop an t-amadóir
issues.timetracker_timer_discard=Déan an t-amadóir a scriosadh
issues.timetracker_timer_manually_add=Cuir Am leis

issues.time_estimate_placeholder=1u 2n
issues.time_estimate_set=Socraigh am measta
issues.time_estimate_display=Meastachán: %s
issues.change_time_estimate_at=d'athraigh an meastachán ama go <b>%s</b> %s
issues.remove_time_estimate_at=baineadh meastachán ama %s
issues.time_estimate_invalid=Tá formáid meastachán ama neamhbhailí
issues.start_tracking_history=thosaigh ag obair %s
issues.tracker_auto_close=Stopfar ama go huathoibríoch nuair a dhúnfar an tsaincheist seo
issues.tracking_already_started=`Tá tús curtha agat cheana féin ag rianú ama ar <a href="%s">eagrán eile</a>!`
issues.stop_tracking_history=d'oibrigh do <b>%s</b> %s
issues.cancel_tracking_history=`rianú ama curtha ar ceal %s`
issues.del_time=Scrios an log ama seo
issues.add_time_history=cuireadh am caite <b>%s</b> %s leis
issues.del_time_history=`an t-am caite scriosta %s`
issues.add_time_manually=Cuir Am leis de Láimh
issues.add_time_hours=Uaireanta
issues.add_time_minutes=Miontuairi
issues.add_time_sum_to_small=Níor iontráilíodh aon am.
Expand Down Expand Up @@ -1926,6 +1945,10 @@ pulls.delete.title=Scrios an t-iarratas tarraingthe seo?
pulls.delete.text=An bhfuil tú cinnte gur mhaith leat an t-iarratas tarraingthe seo a scriosadh? (Bainfidh sé seo an t-inneachar go léir go buan. Smaoinigh ar é a dhúnadh ina ionad sin, má tá sé i gceist agat é a choinneáil i gcartlann)

pulls.recently_pushed_new_branches=Bhrúigh tú ar bhrainse <strong>%[1]s</strong> %[2]s
pulls.upstream_diverging_prompt_behind_1=Tá an brainse seo %d tiomantas taobh thiar de %s
pulls.upstream_diverging_prompt_behind_n=Tá an brainse seo %d geallta taobh thiar de %s
pulls.upstream_diverging_prompt_base_newer=Tá athruithe nua ar an mbunbhrainse %s
pulls.upstream_diverging_merge=Forc sionc

pull.deleted_branch=(scriosta): %s
pull.agit_documentation=Déan athbhreithniú ar dhoiciméid faoi AGit
Expand Down Expand Up @@ -3513,6 +3536,8 @@ alpine.repository=Eolas Stórais
alpine.repository.branches=Brainsí
alpine.repository.repositories=Stórais
alpine.repository.architectures=Ailtireachtaí
arch.registry=Cuir freastalaí leis an stór agus an ailtireacht ghaolmhar le <code>/etc/pacman.conf</code>:
arch.install=Sioncronaigh pacáiste le pacman:
arch.repository=Eolas Stórais
arch.repository.repositories=Stórais
arch.repository.architectures=Ailtireachtaí
Expand Down
58 changes: 58 additions & 0 deletions options/locale/locale_id-ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -76,29 +76,79 @@ loading=Memuat…



archived=Diarsipkan

concept_code_repository=Repositori

show_full_screen=Tampilkan layar penuh
download_logs=Unduh Logs

confirm_delete_selected=Konfirmasi untuk menghapus semua item yang dipilih?

name=Nama
value=Nilai
readme=Baca saya

filter=Saring
filter.clear=Hapus Filter
filter.is_archived=Diarsipkan
filter.not_archived=Tidak Diarsipkan
filter.is_template=Contoh
filter.public=Publik
filter.private=Pribadi

no_results_found=Hasil tidak ditemukan.

[search]
search=Cari...
type_tooltip=Tipe pencarian
fuzzy_tooltip=Termasuk juga hasil yang mendekati kata pencarian
exact_tooltip=Hanya menampilkan hasil yang cocok dengan istilah pencarian
repo_kind=Cari repo...
user_kind=Telusuri pengguna...
org_kind=Cari organisasi...
team_kind=Cari tim...
code_kind=Cari kode...
code_search_unavailable=Pencarian kode saat ini tidak tersedia. Silahkan hubungi administrator.
branch_kind=Cari cabang...

[aria]
navbar=Bar Navigasi
footer=Footer
footer.software=Tentang Software
footer.links=Tautan

[heatmap]
number_of_contributions_in_the_last_12_months=%s Kontribusi pada 12 bulan terakhir
no_contributions=Belum ada kontribusi
less=Lebih sedikit
more=Lebih banyak

[editor]
buttons.heading.tooltip=Tambahkan heading
buttons.bold.tooltip=Tambahkan teks Tebal
buttons.italic.tooltip=Tambahkan teks Miring
buttons.quote.tooltip=Kutip teks
buttons.code.tooltip=Tambah Kode
buttons.link.tooltip=Tambahkan tautan
buttons.list.unordered.tooltip=Tambah daftar titik
buttons.list.ordered.tooltip=Tambah daftar angka
buttons.list.task.tooltip=Tambahkan daftar tugas
buttons.table.add.insert=Tambah
buttons.mention.tooltip=Tandai pengguna atau tim
buttons.ref.tooltip=Merujuk pada isu atau permintaan tarik
buttons.switch_to_legacy.tooltip=Gunakan editor versi lama
buttons.enable_monospace_font=Aktifkan font monospace
buttons.disable_monospace_font=Non-Aktifkan font monospace

[filter]
string.asc=A - Z
string.desc=Z - A

[error]
occurred=Terjadi kesalahan
report_message=Jika Anda yakin ini adalah bug Gitea, silakan cari isu di <a href="%s" target="_blank">GitHub</a> atau buka isu baru jika diperlukan.
not_found=Target tidak dapat ditemukan.

[startpage]
app_desc=Sebuah layanan hosting Git sendiri yang tanpa kesulitan
Expand All @@ -118,8 +168,10 @@ path=Jalur

repo_path=Jalur akar repositori

email_title=Pengaturan email
smtp_addr=Host SMTP
smtp_port=Port SMTP
smtp_from=Kirim Email Sebagai
register_confirm=Perlu Konfirmasi Email Saat Pendaftaran
mail_notify=Aktifkan Notifikasi Email
disable_gravatar=Menonaktifkan Gravatar
Expand All @@ -140,6 +192,7 @@ my_orgs=Organisasi Saya
my_mirrors=Duplikat Saya
view_home=Lihat %s

show_archived=Diarsipkan

show_private=Pribadi

Expand Down Expand Up @@ -481,6 +534,7 @@ email_notifications.enable=Aktifkan Pemberitahuan Surel
email_notifications.disable=Nonaktifkan Email Notifikasi
email_notifications.submit=Pasang Pengaturan Email

visibility.public=Publik
visibility.private=Pribadi

[repo]
Expand Down Expand Up @@ -522,7 +576,9 @@ delete_preexisting_label=Hapus


desc.private=Pribadi
desc.public=Publik
desc.template=Contoh
desc.archived=Diarsipkan

template.webhooks=Webhooks
template.topics=Topik
Expand Down Expand Up @@ -947,6 +1003,7 @@ settings=Pengaturan
settings.full_name=Nama Lengkap
settings.website=Situs web
settings.location=Lokasi
settings.visibility.public=Publik
settings.visibility.private_shortname=Pribadi

settings.update_settings=Perbarui Setelan
Expand Down Expand Up @@ -1033,6 +1090,7 @@ users.created=Dibuat
users.edit=Edit
users.auth_source=Sumber Otentikasi
users.local=Lokal
users.list_status_filter.menu_text=Saring
users.list_status_filter.is_admin=Pengelola

emails.activated=Diaktifkan
Expand Down
10 changes: 5 additions & 5 deletions routers/api/v1/repo/issue_label.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,11 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
return nil, nil, err
}

if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
ctx.Error(http.StatusForbidden, "CanWriteIssuesOrPulls", "write permission is required")
return nil, nil, fmt.Errorf("permission denied")
}

var (
labelIDs []int64
labelNames []string
Expand Down Expand Up @@ -350,10 +355,5 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
return nil, nil, err
}

if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
ctx.Status(http.StatusForbidden)
return nil, nil, nil
}

return issue, labels, err
}
10 changes: 7 additions & 3 deletions routers/web/devtest/mock_actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ func generateMockStepsLog(logCur actions.LogCursor) (stepsLog []*actions.ViewSte
"::endgroup::",
"message for: step={step}, cursor={cursor}",
"message for: step={step}, cursor={cursor}",
"message for: step={step}, cursor={cursor}",
"message for: step={step}, cursor={cursor}",
"message for: step={step}, cursor={cursor}",
"##[group]test group for: step={step}, cursor={cursor}",
"in group msg for: step={step}, cursor={cursor}",
"##[endgroup]",
}
cur := logCur.Cursor // usually the cursor is the "file offset", but here we abuse it as "line number" to make the mock easier, intentionally
for i := 0; i < util.Iif(logCur.Step == 0, 3, 1); i++ {
Expand All @@ -52,6 +52,10 @@ func MockActionsRunsJobs(ctx *context.Context) {
req := web.GetForm(ctx).(*actions.ViewRequest)

resp := &actions.ViewResponse{}
resp.State.Run.TitleHTML = `mock run title <a href="/">link</a>`
resp.State.Run.Status = actions_model.StatusRunning.String()
resp.State.Run.CanCancel = true
resp.State.Run.CanDeleteArtifact = true
resp.Artifacts = append(resp.Artifacts, &actions.ArtifactsViewItem{
Name: "artifact-a",
Size: 100 * 1024,
Expand Down
Loading

0 comments on commit ac5c054

Please sign in to comment.