review

a.kiselev · a.kiselev · commit b0ff6a33fbc2 · 2025-09-18T14:35:52.000+05:00
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -108,7 +108,6 @@ copy_path=Zkopírovat cestu
 copy_success=Zkopírováno!
 copy_error=Kopírování se nezdařilo
 copy_type_unsupported=Tento typ souboru nelze zkopírovat
-copy_filename=Kopírovat název souboru
 
 write=Zapsat
 preview=Náhled
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -108,7 +108,6 @@ copy_path=Pfad kopieren
 copy_success=Kopiert!
 copy_error=Kopieren fehlgeschlagen
 copy_type_unsupported=Dieser Dateityp kann nicht kopiert werden
-copy_filename=Dateinamen kopieren
 
 write=Verfassen
 preview=Vorschau
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -105,7 +105,6 @@ copy_branch=Αντιγραφή ονόματος κλάδου
 copy_success=Αντιγράφηκε!
 copy_error=Η αντιγραφή απέτυχε
 copy_type_unsupported=Αυτός ο τύπος αρχείου δεν μπορεί να αντιγραφεί
-copy_filename=Αντιγραφή ονόματος αρχείου
 
 write=Σύνταξη
 preview=Προεπισκόπηση
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -106,10 +106,10 @@ copy_hash = Copy hash
 copy_content = Copy content
 copy_branch = Copy branch name
 copy_path = Copy path
-copy_filename = Copy filename
 copy_success = Copied!
 copy_error = Copy failed
 copy_type_unsupported = This file type cannot be copied
+copy_filename = Copy filename
 
 write = Write
 preview = Preview
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -103,7 +103,6 @@ copy_branch=Copiar nombre de rama
 copy_success=¡Copiado!
 copy_error=Copiar falló
 copy_type_unsupported=No se puede copiar este tipo de archivo
-copy_filename=Copiar nombre de archivo
 
 write=Escribir
 preview=Vista previa
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -78,7 +78,6 @@ copy_url=کپی URL
 copy_branch=کپی نام شاخه
 copy_success=کپی شد!
 copy_error=کپی ناموفق
-copy_filename=کپی نام فایل
 
 write=نوشتن
 preview=پیش نمایش
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
@@ -91,7 +91,6 @@ copy_url=Kopioi osoite
 copy_branch=Kopioi haaran nimi
 copy_success=Kopioitu!
 copy_error=Kopiointi epäonnistui
-copy_filename=Kopioi tiedostonimi
 
 write=Kirjoita
 preview=Esikatselu
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -109,7 +109,6 @@ copy_path=Copier le chemin
 copy_success=Copié !
 copy_error=Échec de la copie
 copy_type_unsupported=Ce type de fichier ne peut pas être copié
-copy_filename=Copier le nom du fichier
 
 write=Écrire
 preview=Aperçu
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -109,7 +109,6 @@ copy_path=Cóipeáil cosán
 copy_success=Cóipeáil!
 copy_error=Theip ar an gcóipeáil
 copy_type_unsupported=Ní féidir an cineál comhaid seo a chóipeáil
-copy_filename=Cóipeáil ainm an chomhaid
 
 write=Scríobh
 preview=Réamhamharc
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -70,7 +70,6 @@ edit=Szerkesztés
 enabled=Engedélyezett
 disabled=Letiltva
 
-copy_filename=Fájlnév másolása
 
 write=Írás
 preview=Előnézet
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
@@ -97,7 +97,6 @@ copy_branch=Salin nama branch
 copy_success=Tersalin!
 copy_error=Gagal menyalin
 copy_type_unsupported=Tipe berkas ini tidak dapat disalin
-copy_filename=Salin nama file
 
 write=Tulis
 preview=Pratinjau
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
@@ -89,7 +89,6 @@ copy_url=Afrita vefslóð
 copy_branch=Afritaðu heiti greinar
 copy_success=Afritað!
 copy_error=Afritun mistókst
-copy_filename=Afritaðu skráarnafn
 
 write=Skrifa
 preview=Forskoða
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -92,7 +92,6 @@ copy_url=Copia URL
 copy_branch=Copia nome del ramo
 copy_success=Copiato!
 copy_error=Copia fallita
-copy_filename=Copia nome file
 
 write=Scrivi
 preview=Anteprima
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -109,7 +109,6 @@ copy_path=パスをコピー
 copy_success=コピーされました！
 copy_error=コピーに失敗しました
 copy_type_unsupported=このファイルタイプはコピーできません
-copy_filename=ファイル名をコピーする
 
 write=書き込み
 preview=プレビュー
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
@@ -26,7 +26,7 @@ captcha=보안 문자
 twofa=2단계 인증
 twofa_scratch=2단계 일회성 코드
 passcode=인증코드
-copy_filename=파일 이름 복사
+
 
 repository=저장소
 organization=조직
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -107,7 +107,6 @@ copy_branch=Kopēt atzara nosaukumu
 copy_success=Nokopēts!
 copy_error=Kopēšana neizdevās
 copy_type_unsupported=Šī veida failus nav iespējams nokopēt
-copy_filename=Kopēt faila nosaukumu
 
 write=Rakstīt
 preview=Priekšskatītījums
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -92,7 +92,6 @@ copy_url=Kopieer URL
 copy_branch=Kopieer branchnaam
 copy_success=Gekopieerd!
 copy_error=Kopiëren mislukt
-copy_filename=Kopier filnavn
 
 write=Schrijf
 preview=Voorbeeld
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -90,7 +90,6 @@ copy_url=Kopiuj adres URL
 copy_branch=Kopiuj nazwę gałęzi
 copy_success=Skopiowano!
 copy_error=Kopiowanie nie powiodło się
-copy_filename=Kopiuj nazwę pliku
 
 write=Napisz
 preview=Podgląd
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -109,7 +109,6 @@ copy_path=Copiar caminho
 copy_success=Copiado!
 copy_error=A cópia falhou
 copy_type_unsupported=Este tipo de arquivo não pode ser copiado
-copy_filename=Copiar nome do arquivo
 
 write=Escrever
 preview=Pré-visualização
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -109,7 +109,6 @@ copy_path=Copiar caminho
 copy_success=Copiado!
 copy_error=Falha ao copiar
 copy_type_unsupported=Este tipo de ficheiro não pode ser copiado
-copy_filename=Copiar nome do ficheiro
 
 write=Escrever
 preview=Pré-visualizar
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -103,7 +103,6 @@ copy_branch=Скопировать имя ветки
 copy_success=Скопировано!
 copy_error=Ошибка при копировании
 copy_type_unsupported=Невозможно скопировать файл этого типа
-copy_filename=Скопировать имя файла
 
 write=Редактирование
 preview=Предпросмотр
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
@@ -78,7 +78,6 @@ copy_url=ඒ.ස.නි. පිටපත්
 copy_branch=ශාඛාවේ නම පිටපත් කරන්න
 copy_success=පිටපත් විය!
 copy_error=පිටපත් වීමට අසමත් විය
-copy_filename=ගොනු නාමය පිටපත් කරන්න
 
 write=ලියන්න
 preview=පෙරදසුන
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
@@ -104,7 +104,6 @@ copy_branch=Kopírovať meno vetvy
 copy_success=Skopírované!
 copy_error=Kopírovanie zlyhalo
 copy_type_unsupported=Tento typ súboru nie je možné skopírovať
-copy_filename=Kopírovať názov súboru
 
 write=Zapísať
 preview=Náhľad
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -71,7 +71,6 @@ edit=Redigera
 enabled=Aktiv
 disabled=Inaktiverad
 
-copy_filename=Kopiera filnamn
 
 write=Skriv
 preview=Förhandsgranska
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -109,7 +109,6 @@ copy_path=Yolu kopyala
 copy_success=Kopyalandı!
 copy_error=Kopyalama başarısız oldu
 copy_type_unsupported=Bu dosya türü kopyalanamaz
-copy_filename=Dosya adını kopyala
 
 write=Yaz
 preview=Önizleme
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -107,7 +107,6 @@ copy_path=Копіювати шлях
 copy_success=Скопійовано!
 copy_error=Не вдалося скопіювати
 copy_type_unsupported=Цей тип файлу не можна скопіювати
-copy_filename=Копіювати назву файлу
 
 write=Писати
 preview=Попередній перегляд
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
@@ -13,7 +13,7 @@ import (
 	"html/template"
 	"io"
 	"net/url"
-	"path/filepath"
+	"path"
 	"sort"
 	"strings"
 	"time"
@@ -313,7 +313,6 @@ type DiffFile struct {
 
 	// basic fields (parsed from diff result)
 	Name        string
-	ShortName   string
 	NameHash    string
 	OldName     string
 	Addition    int
@@ -406,9 +405,9 @@ func (diffFile *DiffFile) GetDiffFileName() string {
 // GetDiffFileName returns the short name of the diff file, or its short old name in case it was deleted
 func (diffFile *DiffFile) GetDiffFileShortName() string {
 	if diffFile.Name == "" {
-		return filepath.Base(diffFile.OldName)
+		return path.Base(diffFile.OldName)
 	}
-	return filepath.Base(diffFile.Name)
+	return path.Base(diffFile.Name)
 }
 
 func (diffFile *DiffFile) ShouldBeHidden() bool {
@@ -1037,7 +1036,6 @@ func createDiffFile(line string) *DiffFile {
 
 	curFile.OldName, oldNameAmbiguity = readFileName(rd)
 	curFile.Name, newNameAmbiguity = readFileName(rd)
-	curFile.ShortName = curFile.GetDiffFileShortName()
 	if oldNameAmbiguity && newNameAmbiguity {
 		curFile.isAmbiguous = true
 		// OK we should bet that the oldName and the newName are the same if they can be made to be same
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
@@ -143,7 +143,7 @@
 											<button class="unescape-button item" data-unicode-content-selector="#diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</button>
 											<button class="escape-button tw-hidden item" data-unicode-content-selector="#diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
 										{{end}}
-										<button class="copy-filename-button item" data-clipboard-text="{{$file.ShortName}}">{{ctx.Locale.Tr "copy_filename"}}</button>
+										<button class="copy-filename-button item" data-clipboard-text="{{$file.GetDiffFileShortName}}">{{ctx.Locale.Tr "copy_filename"}}</button>
 										{{if not $.PageIsWiki}}
 											{{if $file.IsDeleted}}
 												<a class="item" rel="nofollow" href="{{$.BeforeSourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
