Refactor HTTP Client and LocalizedError packages

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:

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>

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>

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>

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>

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>

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>

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>

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">

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 }}>

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>

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>