Merge pull request #669 from NyaaPantsu/filesize-function
Filesize function
Cette révision appartient à :
révision
af3d8957b3
4 fichiers modifiés avec 5 ajouts et 19 suppressions
|
@ -11,8 +11,6 @@ import (
|
|||
"github.com/NyaaPantsu/nyaa/config"
|
||||
"github.com/NyaaPantsu/nyaa/service/user/permission"
|
||||
"github.com/NyaaPantsu/nyaa/util/languages"
|
||||
|
||||
"github.com/nicksnyder/go-i18n/i18n"
|
||||
)
|
||||
|
||||
type captchaData struct {
|
||||
|
@ -210,11 +208,11 @@ var FuncMap = template.FuncMap{
|
|||
}
|
||||
return e
|
||||
},
|
||||
"fileSize": func(filesize string, T i18n.TranslateFunc) string {
|
||||
"fileSize": func(filesize string, T languages.TemplateTfunc) template.HTML {
|
||||
if (filesize == "Unknown") {
|
||||
return T("unknown")
|
||||
}
|
||||
return filesize
|
||||
return template.HTML(filesize)
|
||||
},
|
||||
"makeCaptchaData": func(captchaID string, T languages.TemplateTfunc) captchaData {
|
||||
return captchaData{captchaID, T}
|
||||
|
|
|
@ -34,11 +34,7 @@
|
|||
</td>
|
||||
<td class="nowrap date-short">{{.Date}}</td>
|
||||
<td class="nowrap">
|
||||
{{if ne .Filesize "Unknown"}}
|
||||
{{.Filesize}}
|
||||
{{else}}
|
||||
{{ call $.T "unknown"}}
|
||||
{{end}}
|
||||
{{ fileSize .Filesize $.T }}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{.Magnet}}" title="{{ call $.T "magnet_link" }}">
|
||||
|
|
|
@ -74,11 +74,7 @@ Your browser does not support the audio element.
|
|||
{{end}}
|
||||
<td class="hidden-xs nowrap date-short">{{.Date}}</td>
|
||||
<td class="hidden-xs nowrap">
|
||||
{{if ne .Filesize "Unknown"}}
|
||||
{{.Filesize}}
|
||||
{{else}}
|
||||
{{ call $.T "unknown"}}
|
||||
{{end}}
|
||||
{{ fileSize .Filesize $.T }}
|
||||
</td>
|
||||
<td class="hidden-xs nowrap">
|
||||
<a href="{{.Magnet}}" title="Magnet link">
|
||||
|
|
|
@ -72,11 +72,7 @@
|
|||
<hr>
|
||||
<h4>{{ call $.T "size"}}</h4>
|
||||
<p>
|
||||
{{if ne .Filesize "Unknown"}}
|
||||
{{.Filesize}}
|
||||
{{else}}
|
||||
{{ call $.T "unknown"}}
|
||||
{{end}}
|
||||
{{ fileSize .Filesize $.T }}
|
||||
</p>
|
||||
<hr>
|
||||
{{if ne .WebsiteLink ""}}
|
||||
|
|
Référencer dans un nouveau ticket