Skip to content

Commit fa68c6e

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Make RepoActionView.vue support `##[group]` (go-gitea#32770) [skip ci] Updated translations via Crowdin Make Monaco theme follow browser, fully type codeeditor.ts (go-gitea#32756) Fix duplicate dropdown dividers (go-gitea#32760) Remove unnecessary border in repo home page sidebar (go-gitea#32767)
2 parents 24b0634 + 1b069dc commit fa68c6e

File tree

17 files changed

+413
-94
lines changed

17 files changed

+413
-94
lines changed

‎.eslintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ rules:
818818
unicorn/consistent-destructuring: [2]
819819
unicorn/consistent-empty-array-spread: [2]
820820
unicorn/consistent-existence-index-check: [0]
821-
unicorn/consistent-function-scoping: [2]
821+
unicorn/consistent-function-scoping: [0]
822822
unicorn/custom-error-definition: [0]
823823
unicorn/empty-brace-spaces: [2]
824824
unicorn/error-message: [0]

‎modules/templates/helper.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,17 +294,15 @@ func timeEstimateString(timeSec any) string {
294294
return util.TimeEstimateString(v)
295295
}
296296

297-
type QueryString string
298-
299-
func queryBuild(a ...any) QueryString {
297+
func queryBuild(a ...any) template.URL {
300298
var s string
301299
if len(a)%2 == 1 {
302300
if v, ok := a[0].(string); ok {
303301
if v == "" || (v[0] != '?' && v[0] != '&') {
304302
panic("queryBuild: invalid argument")
305303
}
306304
s = v
307-
} else if v, ok := a[0].(QueryString); ok {
305+
} else if v, ok := a[0].(template.URL); ok {
308306
s = string(v)
309307
} else {
310308
panic("queryBuild: invalid argument")
@@ -356,7 +354,7 @@ func queryBuild(a ...any) QueryString {
356354
if s != "" && s != "&" && s[len(s)-1] == '&' {
357355
s = s[:len(s)-1]
358356
}
359-
return QueryString(s)
357+
return template.URL(s)
360358
}
361359

362360
func panicIfDevOrTesting() {

‎options/locale/locale_fr-FR.ini

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ confirm_delete_selected=Êtes-vous sûr de vouloir supprimer tous les éléments
145145
146146
name=Nom
147147
value=Valeur
148+
readme=Lisez-moi
148149
149150
filter=Filtrer
150151
filter.clear=Effacer le filtre
@@ -1032,6 +1033,8 @@ fork_to_different_account=Créer une bifurcation vers un autre compte
10321033
fork_visibility_helper=La visibilité d'un dépôt bifurqué ne peut pas être modifiée.
10331034
fork_branch=Branche à cloner sur la bifurcation
10341035
all_branches=Toutes les branches
1036+
view_all_branches=Voir toutes les branches
1037+
view_all_tags=Voir toutes les étiquettes
10351038
fork_no_valid_owners=Ce dépôt ne peut pas être bifurqué car il n’a pas de propriétaire valide.
10361039
fork.blocked_user=Impossible de bifurquer le dépôt car vous êtes bloqué par son propriétaire.
10371040
use_template=Utiliser ce modèle
@@ -1043,6 +1046,8 @@ generate_repo=Générer un dépôt
10431046
generate_from=Générer depuis
10441047
repo_desc=Description
10451048
repo_desc_helper=Décrire brièvement votre dépôt
1049+
repo_no_desc=Aucune description fournie
1050+
repo_lang=Langue
10461051
repo_gitignore_helper=Sélectionner quelques .gitignore prédéfinies
10471052
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.
10481053
issue_labels=Jeu de labels pour les tickets
@@ -1668,12 +1673,26 @@ issues.delete.title=Supprimer ce ticket ?
16681673
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)
16691674
16701675
issues.tracker=Minuteur
1671-
1676+
issues.timetracker_timer_start=Démarrer le minuteur
1677+
issues.timetracker_timer_stop=Arrêter le minuteur
1678+
issues.timetracker_timer_discard=Annuler le minuteur
1679+
issues.timetracker_timer_manually_add=Pointer du temps
1680+
1681+
issues.time_estimate_placeholder=1h 2m
1682+
issues.time_estimate_set=Définir le temps estimé
1683+
issues.time_estimate_display=Estimation : %s
1684+
issues.change_time_estimate_at=a changé le temps estimé à <b>%s</b> %s
1685+
issues.remove_time_estimate_at=a supprimé le temps estimé %s
1686+
issues.time_estimate_invalid=Le format du temps estimé est invalide
1687+
issues.start_tracking_history=`a commencé son travail %s.`
16721688
issues.tracker_auto_close=Le minuteur sera automatiquement arrêté quand le ticket sera fermé.
16731689
issues.tracking_already_started=`Vous avez déjà un minuteur en cours sur <a href="%s">un autre ticket</a> !`
1690+
issues.stop_tracking_history=`a fini de travailler sur <b>%s</b> %s.`
16741691
issues.cancel_tracking_history=`a abandonné son minuteur %s.`
16751692
issues.del_time=Supprimer ce minuteur du journal
1693+
issues.add_time_history=`a pointé du temps de travail %s.`
16761694
issues.del_time_history=`a supprimé son temps de travail %s.`
1695+
issues.add_time_manually=Temps pointé manuellement
16771696
issues.add_time_hours=Heures
16781697
issues.add_time_minutes=Minutes
16791698
issues.add_time_sum_to_small=Aucun minuteur n'a été saisi.
@@ -1926,6 +1945,10 @@ pulls.delete.title=Supprimer cette demande d'ajout ?
19261945
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é)
19271946
19281947
pulls.recently_pushed_new_branches=Vous avez soumis sur la branche <strong>%[1]s</strong> %[2]s
1948+
pulls.upstream_diverging_prompt_behind_1=Cette branche est en retard de %d révision sur %s
1949+
pulls.upstream_diverging_prompt_behind_n=Cette branche est en retard de %d révisions sur %s
1950+
pulls.upstream_diverging_prompt_base_newer=La branche de base %s a de nouveaux changements
1951+
pulls.upstream_diverging_merge=Synchroniser la bifurcation
19291952
19301953
pull.deleted_branch=(supprimé) : %s
19311954
pull.agit_documentation=Voir la documentation sur AGit
@@ -3513,6 +3536,8 @@ alpine.repository=Informations sur le Dépôt
35133536
alpine.repository.branches=Branches
35143537
alpine.repository.repositories=Dépôts
35153538
alpine.repository.architectures=Architectures
3539+
arch.registry=Ajouter un serveur avec un dépôt et une architecture liés dans <code>/etc/pacman.conf</code> :
3540+
arch.install=Synchroniser le paquet avec pacman :
35163541
arch.repository=Informations sur le Dépôt
35173542
arch.repository.repositories=Dépôts
35183543
arch.repository.architectures=Architectures

‎options/locale/locale_ga-IE.ini

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ confirm_delete_selected=Deimhnigh chun gach earra roghnaithe a scriosadh?
145145
146146
name=Ainm
147147
value=Luach
148+
readme=Readme
148149
149150
filter=Scagaire
150151
filter.clear=Scagaire Soiléir
@@ -1032,6 +1033,8 @@ fork_to_different_account=Forc chuig cuntas difriúil
10321033
fork_visibility_helper=Ní féidir infheictheacht stór forcailte a athrú.
10331034
fork_branch=Brainse le clónú chuig an bhforc
10341035
all_branches=Gach brainse
1036+
view_all_branches=Féach ar gach brainse
1037+
view_all_tags=Féach ar gach clib
10351038
fork_no_valid_owners=Ní féidir an stór seo a fhorcáil toisc nach bhfuil úinéirí bailí ann.
10361039
fork.blocked_user=Ní féidir an stór a fhorcáil toisc go bhfuil úinéir an stórais bac ort.
10371040
use_template=Úsáid an teimpléad seo
@@ -1043,6 +1046,8 @@ generate_repo=Cruthaigh Stóras
10431046
generate_from=Gin Ó
10441047
repo_desc=Cur síos
10451048
repo_desc_helper=Cuir isteach tuairisc ghearr (roghnach)
1049+
repo_no_desc=Níor tugadh tuairisc
1050+
repo_lang=Teangacha
10461051
repo_gitignore_helper=Roghnaigh teimpléid .gitignore.
10471052
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.
10481053
issue_labels=Lipéid Eisiúna
@@ -1668,12 +1673,26 @@ issues.delete.title=Scrios an t-eagrán seo?
16681673
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)
16691674

16701675
issues.tracker=Rianaitheoir Ama
1671-
1676+
issues.timetracker_timer_start=Amadóir tosaithe
1677+
issues.timetracker_timer_stop=Stop an t-amadóir
1678+
issues.timetracker_timer_discard=Déan an t-amadóir a scriosadh
1679+
issues.timetracker_timer_manually_add=Cuir Am leis
1680+
1681+
issues.time_estimate_placeholder=1u 2n
1682+
issues.time_estimate_set=Socraigh am measta
1683+
issues.time_estimate_display=Meastachán: %s
1684+
issues.change_time_estimate_at=d'athraigh an meastachán ama go <b>%s</b> %s
1685+
issues.remove_time_estimate_at=baineadh meastachán ama %s
1686+
issues.time_estimate_invalid=Tá formáid meastachán ama neamhbhailí
1687+
issues.start_tracking_history=thosaigh ag obair %s
16721688
issues.tracker_auto_close=Stopfar ama go huathoibríoch nuair a dhúnfar an tsaincheist seo
16731689
issues.tracking_already_started=`Tá tús curtha agat cheana féin ag rianú ama ar <a href="%s">eagrán eile</a>!`
1690+
issues.stop_tracking_history=d'oibrigh do <b>%s</b> %s
16741691
issues.cancel_tracking_history=`rianú ama curtha ar ceal %s`
16751692
issues.del_time=Scrios an log ama seo
1693+
issues.add_time_history=cuireadh am caite <b>%s</b> %s leis
16761694
issues.del_time_history=`an t-am caite scriosta %s`
1695+
issues.add_time_manually=Cuir Am leis de Láimh
16771696
issues.add_time_hours=Uaireanta
16781697
issues.add_time_minutes=Miontuairi
16791698
issues.add_time_sum_to_small=Níor iontráilíodh aon am.
@@ -1926,6 +1945,10 @@ pulls.delete.title=Scrios an t-iarratas tarraingthe seo?
19261945
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)
19271946

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

19301953
pull.deleted_branch=(scriosta): %s
19311954
pull.agit_documentation=Déan athbhreithniú ar dhoiciméid faoi AGit
@@ -3513,6 +3536,8 @@ alpine.repository=Eolas Stórais
35133536
alpine.repository.branches=Brainsí
35143537
alpine.repository.repositories=Stórais
35153538
alpine.repository.architectures=Ailtireachtaí
3539+
arch.registry=Cuir freastalaí leis an stór agus an ailtireacht ghaolmhar le <code>/etc/pacman.conf</code>:
3540+
arch.install=Sioncronaigh pacáiste le pacman:
35163541
arch.repository=Eolas Stórais
35173542
arch.repository.repositories=Stórais
35183543
arch.repository.architectures=Ailtireachtaí

‎options/locale/locale_id-ID.ini

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,79 @@ loading=Memuat…
7676

7777

7878

79+
archived=Diarsipkan
7980

8081
concept_code_repository=Repositori
8182

83+
show_full_screen=Tampilkan layar penuh
84+
download_logs=Unduh Logs
8285

86+
confirm_delete_selected=Konfirmasi untuk menghapus semua item yang dipilih?
8387

8488
name=Nama
89+
value=Nilai
90+
readme=Baca saya
8591

92+
filter=Saring
93+
filter.clear=Hapus Filter
94+
filter.is_archived=Diarsipkan
95+
filter.not_archived=Tidak Diarsipkan
8696
filter.is_template=Contoh
97+
filter.public=Publik
8798
filter.private=Pribadi
8899

100+
no_results_found=Hasil tidak ditemukan.
89101

90102
[search]
103+
search=Cari...
104+
type_tooltip=Tipe pencarian
105+
fuzzy_tooltip=Termasuk juga hasil yang mendekati kata pencarian
106+
exact_tooltip=Hanya menampilkan hasil yang cocok dengan istilah pencarian
107+
repo_kind=Cari repo...
108+
user_kind=Telusuri pengguna...
109+
org_kind=Cari organisasi...
110+
team_kind=Cari tim...
111+
code_kind=Cari kode...
112+
code_search_unavailable=Pencarian kode saat ini tidak tersedia. Silahkan hubungi administrator.
113+
branch_kind=Cari cabang...
91114

92115
[aria]
116+
navbar=Bar Navigasi
117+
footer=Footer
118+
footer.software=Tentang Software
119+
footer.links=Tautan
93120

94121
[heatmap]
122+
number_of_contributions_in_the_last_12_months=%s Kontribusi pada 12 bulan terakhir
123+
no_contributions=Belum ada kontribusi
124+
less=Lebih sedikit
125+
more=Lebih banyak
95126

96127
[editor]
128+
buttons.heading.tooltip=Tambahkan heading
129+
buttons.bold.tooltip=Tambahkan teks Tebal
130+
buttons.italic.tooltip=Tambahkan teks Miring
131+
buttons.quote.tooltip=Kutip teks
132+
buttons.code.tooltip=Tambah Kode
133+
buttons.link.tooltip=Tambahkan tautan
134+
buttons.list.unordered.tooltip=Tambah daftar titik
135+
buttons.list.ordered.tooltip=Tambah daftar angka
136+
buttons.list.task.tooltip=Tambahkan daftar tugas
97137
buttons.table.add.insert=Tambah
138+
buttons.mention.tooltip=Tandai pengguna atau tim
139+
buttons.ref.tooltip=Merujuk pada isu atau permintaan tarik
140+
buttons.switch_to_legacy.tooltip=Gunakan editor versi lama
141+
buttons.enable_monospace_font=Aktifkan font monospace
142+
buttons.disable_monospace_font=Non-Aktifkan font monospace
98143

99144
[filter]
145+
string.asc=A - Z
146+
string.desc=Z - A
100147

101148
[error]
149+
occurred=Terjadi kesalahan
150+
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.
151+
not_found=Target tidak dapat ditemukan.
102152

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

119169
repo_path=Jalur akar repositori
120170

171+
email_title=Pengaturan email
121172
smtp_addr=Host SMTP
122173
smtp_port=Port SMTP
174+
smtp_from=Kirim Email Sebagai
123175
register_confirm=Perlu Konfirmasi Email Saat Pendaftaran
124176
mail_notify=Aktifkan Notifikasi Email
125177
disable_gravatar=Menonaktifkan Gravatar
@@ -140,6 +192,7 @@ my_orgs=Organisasi Saya
140192
my_mirrors=Duplikat Saya
141193
view_home=Lihat %s
142194

195+
show_archived=Diarsipkan
143196

144197
show_private=Pribadi
145198

@@ -481,6 +534,7 @@ email_notifications.enable=Aktifkan Pemberitahuan Surel
481534
email_notifications.disable=Nonaktifkan Email Notifikasi
482535
email_notifications.submit=Pasang Pengaturan Email
483536

537+
visibility.public=Publik
484538
visibility.private=Pribadi
485539

486540
[repo]
@@ -522,7 +576,9 @@ delete_preexisting_label=Hapus
522576

523577

524578
desc.private=Pribadi
579+
desc.public=Publik
525580
desc.template=Contoh
581+
desc.archived=Diarsipkan
526582

527583
template.webhooks=Webhooks
528584
template.topics=Topik
@@ -947,6 +1003,7 @@ settings=Pengaturan
9471003
settings.full_name=Nama Lengkap
9481004
settings.website=Situs web
9491005
settings.location=Lokasi
1006+
settings.visibility.public=Publik
9501007
settings.visibility.private_shortname=Pribadi
9511008

9521009
settings.update_settings=Perbarui Setelan
@@ -1033,6 +1090,7 @@ users.created=Dibuat
10331090
users.edit=Edit
10341091
users.auth_source=Sumber Otentikasi
10351092
users.local=Lokal
1093+
users.list_status_filter.menu_text=Saring
10361094
users.list_status_filter.is_admin=Pengelola
10371095

10381096
emails.activated=Diaktifkan

‎routers/web/devtest/mock_actions.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ func generateMockStepsLog(logCur actions.LogCursor) (stepsLog []*actions.ViewSte
2626
"::endgroup::",
2727
"message for: step={step}, cursor={cursor}",
2828
"message for: step={step}, cursor={cursor}",
29-
"message for: step={step}, cursor={cursor}",
30-
"message for: step={step}, cursor={cursor}",
31-
"message for: step={step}, cursor={cursor}",
29+
"##[group]test group for: step={step}, cursor={cursor}",
30+
"in group msg for: step={step}, cursor={cursor}",
31+
"##[endgroup]",
3232
}
3333
cur := logCur.Cursor // usually the cursor is the "file offset", but here we abuse it as "line number" to make the mock easier, intentionally
3434
for i := 0; i < util.Iif(logCur.Step == 0, 3, 1); i++ {
@@ -52,6 +52,10 @@ func MockActionsRunsJobs(ctx *context.Context) {
5252
req := web.GetForm(ctx).(*actions.ViewRequest)
5353

5454
resp := &actions.ViewResponse{}
55+
resp.State.Run.TitleHTML = `mock run title <a href="/">link</a>`
56+
resp.State.Run.Status = actions_model.StatusRunning.String()
57+
resp.State.Run.CanCancel = true
58+
resp.State.Run.CanDeleteArtifact = true
5559
resp.Artifacts = append(resp.Artifacts, &actions.ArtifactsViewItem{
5660
Name: "artifact-a",
5761
Size: 100 * 1024,

‎templates/projects/view.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@
3636
{{range .Labels}}
3737
{{$exclusiveScope := .ExclusiveScope}}
3838
{{if and (ne $previousExclusiveScope $exclusiveScope)}}
39-
<div class="divider"></div>
39+
<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
4040
{{end}}
4141
{{$previousExclusiveScope = $exclusiveScope}}
42-
<a class="item label-filter-item tw-flex tw-items-center" {{if .IsArchived}}data-is-archived{{end}} href="?labels={{.QueryString}}&assignee={{$.AssigneeID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}" data-label-id="{{.ID}}">
42+
<a class="item label-filter-item tw-flex tw-items-center" data-label-id="{{.ID}}" data-scope="{{.ExclusiveScope}}" {{if .IsArchived}}data-is-archived{{end}}
43+
href="?labels={{.QueryString}}&assignee={{$.AssigneeID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">
4344
{{if .IsExcluded}}
4445
{{svg "octicon-circle-slash"}}
4546
{{else if .IsSelected}}

‎templates/repo/issue/filter_list.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@
3030
{{range .Labels}}
3131
{{$exclusiveScope := .ExclusiveScope}}
3232
{{if and (ne $previousExclusiveScope $exclusiveScope)}}
33-
<div class="divider"></div>
33+
<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
3434
{{end}}
3535
{{$previousExclusiveScope = $exclusiveScope}}
36-
<a class="item label-filter-item tw-flex tw-items-center" {{if .IsArchived}}data-is-archived{{end}} href="{{QueryBuild $queryLink "labels" .QueryString}}" data-label-id="{{.ID}}">
36+
<a class="item label-filter-item tw-flex tw-items-center" data-label-id="{{.ID}}" data-scope="{{.ExclusiveScope}}" {{if .IsArchived}}data-is-archived{{end}}
37+
href="{{QueryBuild $queryLink "labels" .QueryString}}">
3738
{{if .IsExcluded}}
3839
{{svg "octicon-circle-slash"}}
3940
{{else if .IsSelected}}

‎templates/repo/issue/sidebar/label_list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{{range $data.RepoLabels}}
2323
{{$exclusiveScope := .ExclusiveScope}}
2424
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
25-
<div class="divider"></div>
25+
<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
2626
{{end}}
2727
{{$previousExclusiveScope = $exclusiveScope}}
2828
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
@@ -32,7 +32,7 @@
3232
{{range $data.OrgLabels}}
3333
{{$exclusiveScope := .ExclusiveScope}}
3434
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
35-
<div class="divider"></div>
35+
<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
3636
{{end}}
3737
{{$previousExclusiveScope = $exclusiveScope}}
3838
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}

0 commit comments

Comments
 (0)