Skip to content

Commit f1de1b2

Browse files
authored
Merge branch 'main' into migration-checks
2 parents 63715dd + 18046eb commit f1de1b2

File tree

7 files changed

+73
-31
lines changed

7 files changed

+73
-31
lines changed

options/locale/locale_es-ES.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,7 @@ release.content=Contenido
22272227
release.prerelease_desc=Marcar como Pre-Lanzamiento
22282228
release.prerelease_helper=Marcar este lanzamiento como no es adecuada para usar en producción.
22292229
release.cancel=Cancelar
2230-
release.publish=Publicar Release
2230+
release.publish=Publicar lanzamiento
22312231
release.save_draft=Guardar borrador
22322232
release.edit_release=Actualizar Lanzamiento
22332233
release.delete_release=Eliminar Lanzamiento
@@ -3131,6 +3131,8 @@ rubygems.dependencies.development=Dependencias de desarrollo
31313131
rubygems.required.ruby=Requiere versión Ruby
31323132
rubygems.required.rubygems=Requiere la versión de RubyGem
31333133
rubygems.documentation=Para obtener más información sobre el registro de RubyGems, consulte <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/rubygems/">la documentación</a>.
3134+
vagrant.install=Para añadir un paquete Vagrant, ejecuta el siguiente comando:
3135+
vagrant.documentation=Para más información sobre el registro de paquetes Vagrant, revisa la <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/vagrant/">documentación</a>.
31343136
settings.link=Vincular este paquete a un repositorio
31353137
settings.link.description=Si enlaza un paquete con un repositorio, el paquete se enumera en la lista de paquetes del repositorio.
31363138
settings.link.select=Seleccionar repositorio

options/locale/locale_fr-FR.ini

Lines changed: 50 additions & 19 deletions
Large diffs are not rendered by default.

options/locale/locale_tr-TR.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ org_no_results=Eşleşen organizasyon bulunamadı.
277277
code_no_results=Aranan terimlerle eşleşen bir kaynak kod bulunamadı.
278278
code_search_results='%s' için arama sonuçları
279279
code_last_indexed_at=Son endekslenen %s
280+
relevant_repositories_tooltip=Çatal olan veya konusu, simgesi veya açıklaması olmayan depolar gizlenmiştir.
281+
relevant_repositories=Sadece ilişkili depolar gösteriliyor, <a href="%s">filtrelenmemiş sonuçları göster</a>.
280282

281283

282284
[auth]
@@ -3129,6 +3131,8 @@ rubygems.dependencies.development=Geliştirme Bağımlılıkları
31293131
rubygems.required.ruby=Gereken Ruby sürümü
31303132
rubygems.required.rubygems=Gereken RubyGem sürümü
31313133
rubygems.documentation=RubyGems kütüğü hakkında daha fazla bilgi için, <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/rubygems/">belgeye</a> bakabilirsiniz.
3134+
vagrant.install=Vagrant paketi eklemek için aşağıdaki komutu çalıştırın:
3135+
vagrant.documentation=Vagrant kütüğü hakkında daha fazla bilgi için, <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/vagrant/">belgeye</a> bakabilirsiniz.
31323136
settings.link=Bu paketi bir depoya bağlayın
31333137
settings.link.description=Eğer bir paketi bir depoya bağlarsanız, paket deponun paket listesinde listelenecektir.
31343138
settings.link.select=Depo Seç

routers/api/packages/npm/api.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,18 @@ func createPackageMetadataVersion(registryURL string, pd *packages_model.Package
5555
metadata := pd.Metadata.(*npm_module.Metadata)
5656

5757
return &npm_module.PackageMetadataVersion{
58-
ID: fmt.Sprintf("%s@%s", pd.Package.Name, pd.Version.Version),
59-
Name: pd.Package.Name,
60-
Version: pd.Version.Version,
61-
Description: metadata.Description,
62-
Author: npm_module.User{Name: metadata.Author},
63-
Homepage: metadata.ProjectURL,
64-
License: metadata.License,
65-
Dependencies: metadata.Dependencies,
66-
Readme: metadata.Readme,
58+
ID: fmt.Sprintf("%s@%s", pd.Package.Name, pd.Version.Version),
59+
Name: pd.Package.Name,
60+
Version: pd.Version.Version,
61+
Description: metadata.Description,
62+
Author: npm_module.User{Name: metadata.Author},
63+
Homepage: metadata.ProjectURL,
64+
License: metadata.License,
65+
Dependencies: metadata.Dependencies,
66+
DevDependencies: metadata.DevelopmentDependencies,
67+
PeerDependencies: metadata.PeerDependencies,
68+
OptionalDependencies: metadata.OptionalDependencies,
69+
Readme: metadata.Readme,
6770
Dist: npm_module.PackageDistribution{
6871
Shasum: pd.Files[0].Blob.HashSHA1,
6972
Integrity: "sha512-" + base64.StdEncoding.EncodeToString(hashBytes),

templates/repo/diff/comment_form.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<input type="hidden" name="reply" value="{{$.reply}}">
3030
{{else}}
3131
{{if $.root.CurrentReview}}
32+
{{/* if there is only one "Add comment" button, the quick-submit should submit the form with is_review=true even if the "Add comment" button is not really clicked */}}
33+
<input type="hidden" name="is_review" value="true">
3234
<button name="is_review" value="true" type="submit"
3335
class="ui submit green tiny button btn-add-comment">{{$.root.locale.Tr "repo.diff.comment.add_review_comment"}}</button>
3436
{{else}}

templates/repo/sub_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</div>
4040
<a class="ui segment language-stats">
4141
{{range .LanguageStats}}
42-
<div class="bar" style="width: {{.Percentage}}%; background-color: {{.Color}}">&nbsp;</div>
42+
<div class="bar tooltip" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-placement="top" data-content={{ .Language }}>&nbsp;</div>
4343
{{end}}
4444
</a>
4545
{{end}}

web_src/js/modules/tippy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import tippy from 'tippy.js';
33
export function createTippy(target, opts = {}) {
44
const instance = tippy(target, {
55
appendTo: document.body,
6-
placement: 'top-start',
6+
placement: target.getAttribute('data-placement') || 'top-start',
77
animation: false,
88
allowHTML: false,
99
maxWidth: 500, // increase over default 350px

0 commit comments

Comments
 (0)