diff options
Diffstat (limited to 'internal/template')
12 files changed, 11 insertions, 16 deletions
diff --git a/internal/template/engine.go b/internal/template/engine.go index 4104e019..1c834f35 100644 --- a/internal/template/engine.go +++ b/internal/template/engine.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "miniflux.app/v2/internal/errors" "miniflux.app/v2/internal/locale" "github.com/gorilla/mux" @@ -119,10 +118,6 @@ func (e *Engine) Render(name string, data map[string]interface{}) []byte { switch k := key.(type) { case string: return printer.Printf(k, args...) - case errors.LocalizedError: - return k.Localize(printer) - case *errors.LocalizedError: - return k.Localize(printer) case error: return k.Error() default: diff --git a/internal/template/templates/views/add_subscription.html b/internal/template/templates/views/add_subscription.html index be208f60..5a2cd3d6 100644 --- a/internal/template/templates/views/add_subscription.html +++ b/internal/template/templates/views/add_subscription.html @@ -13,7 +13,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-url">{{ t "page.add_feed.label.url" }}</label> diff --git a/internal/template/templates/views/create_api_key.html b/internal/template/templates/views/create_api_key.html index 8c1e2f28..cf6ace4c 100644 --- a/internal/template/templates/views/create_api_key.html +++ b/internal/template/templates/views/create_api_key.html @@ -10,7 +10,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-description">{{ t "form.api_key.label.description" }}</label> diff --git a/internal/template/templates/views/create_category.html b/internal/template/templates/views/create_category.html index c6be3e6f..c9635966 100644 --- a/internal/template/templates/views/create_category.html +++ b/internal/template/templates/views/create_category.html @@ -14,7 +14,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-title">{{ t "form.category.label.title" }}</label> diff --git a/internal/template/templates/views/create_user.html b/internal/template/templates/views/create_user.html index 155cb9bf..cce2a7bb 100644 --- a/internal/template/templates/views/create_user.html +++ b/internal/template/templates/views/create_user.html @@ -10,7 +10,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-username">{{ t "form.user.label.username" }}</label> diff --git a/internal/template/templates/views/edit_category.html b/internal/template/templates/views/edit_category.html index 4412ff97..16588a60 100644 --- a/internal/template/templates/views/edit_category.html +++ b/internal/template/templates/views/edit_category.html @@ -20,7 +20,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-title">{{ t "form.category.label.title" }}</label> diff --git a/internal/template/templates/views/edit_feed.html b/internal/template/templates/views/edit_feed.html index 37f719b5..fc621826 100644 --- a/internal/template/templates/views/edit_feed.html +++ b/internal/template/templates/views/edit_feed.html @@ -37,7 +37,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <fieldset> diff --git a/internal/template/templates/views/edit_user.html b/internal/template/templates/views/edit_user.html index 87765110..e8b735f4 100644 --- a/internal/template/templates/views/edit_user.html +++ b/internal/template/templates/views/edit_user.html @@ -10,7 +10,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-username">{{ t "form.user.label.username" }}</label> diff --git a/internal/template/templates/views/import.html b/internal/template/templates/views/import.html index 042b1962..55d9fe4d 100644 --- a/internal/template/templates/views/import.html +++ b/internal/template/templates/views/import.html @@ -7,7 +7,7 @@ </section> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <form action="{{ route "uploadOPML" }}" method="post" enctype="multipart/form-data"> diff --git a/internal/template/templates/views/integrations.html b/internal/template/templates/views/integrations.html index faffb3b7..4edb98d1 100644 --- a/internal/template/templates/views/integrations.html +++ b/internal/template/templates/views/integrations.html @@ -10,7 +10,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <details {{ if .form.AppriseEnabled }}open{{ end }}> diff --git a/internal/template/templates/views/login.html b/internal/template/templates/views/login.html index 4831eefe..74ed39c9 100644 --- a/internal/template/templates/views/login.html +++ b/internal/template/templates/views/login.html @@ -6,7 +6,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <label for="form-username">{{ t "form.user.label.username" }}</label> diff --git a/internal/template/templates/views/settings.html b/internal/template/templates/views/settings.html index 3cc4adf4..43ded00d 100644 --- a/internal/template/templates/views/settings.html +++ b/internal/template/templates/views/settings.html @@ -10,7 +10,7 @@ <input type="hidden" name="csrf" value="{{ .csrf }}"> {{ if .errorMessage }} - <div class="alert alert-error">{{ t .errorMessage }}</div> + <div class="alert alert-error">{{ .errorMessage }}</div> {{ end }} <fieldset> |