diff --git a/router/template_functions.go b/router/template_functions.go index df9fdf9e..d6c0d88f 100644 --- a/router/template_functions.go +++ b/router/template_functions.go @@ -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} diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html index b2feb40f..aff9cf43 100644 --- a/templates/_user_list_torrents.html +++ b/templates/_user_list_torrents.html @@ -34,11 +34,7 @@ {{.Date}} - {{if ne .Filesize "Unknown"}} - {{.Filesize}} - {{else}} - {{ call $.T "unknown"}} - {{end}} + {{ fileSize .Filesize $.T }} diff --git a/templates/home.html b/templates/home.html index d4042bdc..b81e413b 100644 --- a/templates/home.html +++ b/templates/home.html @@ -74,11 +74,7 @@ Your browser does not support the audio element. {{end}} {{.Date}} - {{if ne .Filesize "Unknown"}} - {{.Filesize}} - {{else}} - {{ call $.T "unknown"}} - {{end}} + {{ fileSize .Filesize $.T }} diff --git a/templates/view.html b/templates/view.html index fc46858e..a2955541 100644 --- a/templates/view.html +++ b/templates/view.html @@ -72,11 +72,7 @@

{{ call $.T "size"}}

- {{if ne .Filesize "Unknown"}} - {{.Filesize}} - {{else}} - {{ call $.T "unknown"}} - {{end}} + {{ fileSize .Filesize $.T }}


{{if ne .WebsiteLink ""}}