diff options
| author | akuma06 <demon.akuma06@gmail.com> | 2017-05-21 14:05:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 14:05:52 +0200 |
| commit | af3d8957b34d46f54f05c6efcf358711b36e18af (patch) | |
| tree | c332a4399a8ef029586ed8649b195d7a8f5cd9f8 | |
| parent | 380515b3220b5ead2eefe4d678619d82183f3567 (diff) | |
| parent | 11950930ad955327250a4846a5aba043af448ff2 (diff) | |
| download | nyaa-af3d8957b34d46f54f05c6efcf358711b36e18af.zip nyaa-af3d8957b34d46f54f05c6efcf358711b36e18af.tar.gz nyaa-af3d8957b34d46f54f05c6efcf358711b36e18af.tar.bz2 | |
Merge pull request #669 from NyaaPantsu/filesize-function
Filesize function
| -rw-r--r-- | router/template_functions.go | 6 | ||||
| -rw-r--r-- | templates/_user_list_torrents.html | 6 | ||||
| -rw-r--r-- | templates/home.html | 6 | ||||
| -rw-r--r-- | templates/view.html | 6 |
4 files changed, 5 insertions, 19 deletions
diff --git a/router/template_functions.go b/router/template_functions.go index df9fdf9..d6c0d88 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 b2feb40..aff9cf4 100644 --- a/templates/_user_list_torrents.html +++ b/templates/_user_list_torrents.html @@ -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" }}"> diff --git a/templates/home.html b/templates/home.html index d4042bd..b81e413 100644 --- a/templates/home.html +++ b/templates/home.html @@ -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"> diff --git a/templates/view.html b/templates/view.html index fc46858..a295554 100644 --- a/templates/view.html +++ b/templates/view.html @@ -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 ""}} |