diff options
| author |  Frédéric Guillot <fred@miniflux.net> | 2018-09-22 15:04:55 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@miniflux.net> | 2018-09-22 15:04:55 -0700 |
| commit | b1e8f534eff7569dc2e8dab4dee851d1b709f71b (patch) | |
| tree | ec9d5cbebc78704727c9ce959f442b3df5cc7d76 /daemon | |
| parent | aae9b4eb835c72c0b7ecd8fa6565eacce3963d00 (diff) | |
Simplify locale package usage (refactoring)
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/daemon.go | 6 | ||||
| -rw-r--r-- | daemon/routes.go | 7 | ||||
| -rw-r--r-- | daemon/server.go | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/daemon/daemon.go b/daemon/daemon.go index b33d882..a1fbf8e 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -13,7 +13,6 @@ import ( "time" "miniflux.app/config" - "miniflux.app/locale" "miniflux.app/logger" "miniflux.app/reader/feed" "miniflux.app/scheduler" @@ -39,10 +38,9 @@ func Run(cfg *config.Config, store *storage.Storage) { } }() - translator := locale.Load() - feedHandler := feed.NewFeedHandler(store, translator) + feedHandler := feed.NewFeedHandler(store) pool := scheduler.NewWorkerPool(feedHandler, cfg.WorkerPoolSize()) - server := newServer(cfg, store, pool, feedHandler, translator) + server := newServer(cfg, store, pool, feedHandler) scheduler.NewFeedScheduler( store, diff --git a/daemon/routes.go b/daemon/routes.go index 891207e..88b8c20 100644 --- a/daemon/routes.go +++ b/daemon/routes.go @@ -10,7 +10,6 @@ import ( "miniflux.app/api" "miniflux.app/config" "miniflux.app/fever" - "miniflux.app/locale" "miniflux.app/middleware" "miniflux.app/reader/feed" "miniflux.app/scheduler" @@ -21,12 +20,12 @@ import ( "github.com/gorilla/mux" ) -func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool, translator *locale.Translator) *mux.Router { +func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool) *mux.Router { router := mux.NewRouter() - templateEngine := template.NewEngine(cfg, router, translator) + templateEngine := template.NewEngine(cfg, router) apiController := api.NewController(store, feedHandler) feverController := fever.NewController(cfg, store) - uiController := ui.NewController(cfg, store, pool, feedHandler, templateEngine, translator, router) + uiController := ui.NewController(cfg, store, pool, feedHandler, templateEngine, router) middleware := middleware.New(cfg, store, router) if cfg.BasePath() != "" { diff --git a/daemon/server.go b/daemon/server.go index 841e3b3..38afd0a 100644 --- a/daemon/server.go +++ b/daemon/server.go @@ -10,7 +10,6 @@ import ( "time" "miniflux.app/config" - "miniflux.app/locale" "miniflux.app/logger" "miniflux.app/reader/feed" "miniflux.app/scheduler" @@ -19,7 +18,7 @@ import ( "golang.org/x/crypto/acme/autocert" ) -func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler, translator *locale.Translator) *http.Server { +func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler) *http.Server { certFile := cfg.CertFile() keyFile := cfg.KeyFile() certDomain := cfg.CertDomain() @@ -29,7 +28,7 @@ func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.Worke WriteTimeout: 30 * time.Second, IdleTimeout: 60 * time.Second, Addr: cfg.ListenAddr(), - Handler: routes(cfg, store, feedHandler, pool, translator), + Handler: routes(cfg, store, feedHandler, pool), } if certDomain != "" && certCache != "" { |