From 75c5efb52076f802eeed40448b7f9935994aaf87 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Wed, 15 Sep 2021 07:54:34 +0200
Subject: [PATCH] Move resource locale initial load to boot proc

---
 app/boot_levels.go        | 5 +++++
 system/service/service.go | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/boot_levels.go b/app/boot_levels.go
index 910b46d44..aba6a1872 100644
--- a/app/boot_levels.go
+++ b/app/boot_levels.go
@@ -351,6 +351,11 @@ func (app *CortezaApp) InitServices(ctx context.Context) (err error) {
 		rbac.SetGlobal(ac)
 	}
 
+	locale.Global().BindStore(app.Store)
+	if err = locale.Global().ReloadResourceTranslations(ctx); err != nil {
+		return err
+	}
+
 	if app.Opt.Messagebus.Enabled {
 		// initialize all the queue handlers
 		messagebus.Service().Init(ctx, app.Store)
diff --git a/system/service/service.go b/system/service/service.go
index ca6824d90..964373139 100644
--- a/system/service/service.go
+++ b/system/service/service.go
@@ -10,7 +10,6 @@ import (
 	"github.com/cortezaproject/corteza-server/pkg/eventbus"
 	"github.com/cortezaproject/corteza-server/pkg/healthcheck"
 	"github.com/cortezaproject/corteza-server/pkg/id"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
 	"github.com/cortezaproject/corteza-server/pkg/logger"
 	"github.com/cortezaproject/corteza-server/pkg/objstore"
 	"github.com/cortezaproject/corteza-server/pkg/objstore/minio"
@@ -183,11 +182,6 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, ws websock
 		return err
 	}
 
-	locale.Global().BindStore(DefaultStore)
-	if err = locale.Global().ReloadResourceTranslations(ctx); err != nil {
-		return err
-	}
-
 	automationService.DefaultUser = DefaultUser
 
 	automationService.Registry().AddTypes(