mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-10 04:05:42 +01:00
Rename ByteSize to ReadableSize
This commit is contained in:
parent
dae95f473e
commit
c2d137d1f2
4 changed files with 10 additions and 9 deletions
|
@ -31,8 +31,8 @@ func (l MockLocale) TrN(cnt any, key1, keyN string, args ...any) template.HTML {
|
||||||
return template.HTML(key1)
|
return template.HTML(key1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l MockLocale) TrSize(s int64) ByteSize {
|
func (l MockLocale) TrSize(s int64) ReadableSize {
|
||||||
return ByteSize{fmt.Sprint(s), ""}
|
return ReadableSize{fmt.Sprint(s), ""}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l MockLocale) PrettyNumber(v any) string {
|
func (l MockLocale) PrettyNumber(v any) string {
|
||||||
|
|
|
@ -15,8 +15,8 @@ import (
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/translation/i18n"
|
"code.gitea.io/gitea/modules/translation/i18n"
|
||||||
"code.gitea.io/gitea/modules/util"
|
"code.gitea.io/gitea/modules/util"
|
||||||
"github.com/dustin/go-humanize"
|
|
||||||
|
|
||||||
|
"github.com/dustin/go-humanize"
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
"golang.org/x/text/message"
|
"golang.org/x/text/message"
|
||||||
"golang.org/x/text/number"
|
"golang.org/x/text/number"
|
||||||
|
@ -34,7 +34,7 @@ type Locale interface {
|
||||||
Tr(key string, args ...any) template.HTML
|
Tr(key string, args ...any) template.HTML
|
||||||
TrN(cnt any, key1, keyN string, args ...any) template.HTML
|
TrN(cnt any, key1, keyN string, args ...any) template.HTML
|
||||||
|
|
||||||
TrSize(size int64) ByteSize
|
TrSize(size int64) ReadableSize
|
||||||
|
|
||||||
PrettyNumber(v any) string
|
PrettyNumber(v any) string
|
||||||
}
|
}
|
||||||
|
@ -255,18 +255,18 @@ func (l *locale) TrN(cnt any, key1, keyN string, args ...any) template.HTML {
|
||||||
return l.Tr(keyN, args...)
|
return l.Tr(keyN, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
type ByteSize struct {
|
type ReadableSize struct {
|
||||||
PrettyNumber string
|
PrettyNumber string
|
||||||
TranslatedUnit string
|
TranslatedUnit string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bs ByteSize) String() string {
|
func (bs ReadableSize) String() string {
|
||||||
return bs.PrettyNumber + " " + bs.TranslatedUnit
|
return bs.PrettyNumber + " " + bs.TranslatedUnit
|
||||||
}
|
}
|
||||||
|
|
||||||
// TrSize returns array containing pretty formatted size and localized output of FileSize
|
// TrSize returns array containing pretty formatted size and localized output of FileSize
|
||||||
// output of humanize.IBytes has to be split in order to be localized
|
// output of humanize.IBytes has to be split in order to be localized
|
||||||
func (l *locale) TrSize(s int64) ByteSize {
|
func (l *locale) TrSize(s int64) ReadableSize {
|
||||||
us := uint64(s)
|
us := uint64(s)
|
||||||
if s < 0 {
|
if s < 0 {
|
||||||
us = uint64(-s)
|
us = uint64(-s)
|
||||||
|
@ -281,7 +281,7 @@ func (l *locale) TrSize(s int64) ByteSize {
|
||||||
}
|
}
|
||||||
numberVal = l.PrettyNumber(numberVal)
|
numberVal = l.PrettyNumber(numberVal)
|
||||||
unitVal = l.TrString("munits.data." + strings.ToLower(unitVal))
|
unitVal = l.TrString("munits.data." + strings.ToLower(unitVal))
|
||||||
return ByteSize{numberVal, unitVal}
|
return ReadableSize{numberVal, unitVal}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *locale) PrettyNumber(v any) string {
|
func (l *locale) PrettyNumber(v any) string {
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
<span class="item not-mobile" {{if not (eq .Repository.Size 0)}}data-tooltip-content="{{.Repository.SizeDetailsString ctx.Locale}}"{{end}}>
|
<span class="item not-mobile" {{if not (eq .Repository.Size 0)}}data-tooltip-content="{{.Repository.SizeDetailsString ctx.Locale}}"{{end}}>
|
||||||
{{$fileSizeFields := ctx.Locale.TrSize .Repository.Size }}
|
{{$fileSizeFields := ctx.Locale.TrSize .Repository.Size}}
|
||||||
{{svg "octicon-database"}} <b>{{$fileSizeFields.PrettyNumber}}</b> {{$fileSizeFields.TranslatedUnit}}
|
{{svg "octicon-database"}} <b>{{$fileSizeFields.PrettyNumber}}</b> {{$fileSizeFields.TranslatedUnit}}
|
||||||
</span>
|
</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
@ -14,6 +14,7 @@ import (
|
||||||
"code.gitea.io/gitea/models/unittest"
|
"code.gitea.io/gitea/models/unittest"
|
||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
files_service "code.gitea.io/gitea/services/repository/files"
|
files_service "code.gitea.io/gitea/services/repository/files"
|
||||||
|
|
||||||
"github.com/PuerkitoBio/goquery"
|
"github.com/PuerkitoBio/goquery"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue