mirror of
https://github.com/abhinavxd/libredesk.git
synced 2025-11-02 21:13:47 +00:00
fix panic due to missing i18n dependency
This commit is contained in:
14
cmd/init.go
14
cmd/init.go
@@ -181,10 +181,11 @@ func loadSettings(m *setting.Manager) {
|
||||
}
|
||||
|
||||
// initSettings inits setting manager.
|
||||
func initSettings(db *sqlx.DB) *setting.Manager {
|
||||
func initSettings(db *sqlx.DB, i18n *i18n.I18n) *setting.Manager {
|
||||
s, err := setting.New(setting.Opts{
|
||||
DB: db,
|
||||
Lo: initLogger("settings"),
|
||||
DB: db,
|
||||
Lo: initLogger("settings"),
|
||||
I18n: i18n,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatalf("error initializing setting manager: %v", err)
|
||||
@@ -250,11 +251,12 @@ func initTag(db *sqlx.DB, i18n *i18n.I18n) *tag.Manager {
|
||||
}
|
||||
|
||||
// initViews inits view manager.
|
||||
func initView(db *sqlx.DB) *view.Manager {
|
||||
func initView(db *sqlx.DB, i18n *i18n.I18n) *view.Manager {
|
||||
var lo = initLogger("view_manager")
|
||||
m, err := view.New(view.Opts{
|
||||
DB: db,
|
||||
Lo: lo,
|
||||
DB: db,
|
||||
Lo: lo,
|
||||
I18n: i18n,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatalf("error initializing view manager: %v", err)
|
||||
|
||||
@@ -157,8 +157,10 @@ func main() {
|
||||
// Check for pending upgrade.
|
||||
checkPendingUpgrade(db)
|
||||
|
||||
i18n := initI18n(fs)
|
||||
|
||||
// Load app settings from DB into the Koanf instance.
|
||||
settings := initSettings(db)
|
||||
settings := initSettings(db, i18n)
|
||||
loadSettings(settings)
|
||||
|
||||
// Fallback for config typo. Logs a warning but continues to work with the incorrect key.
|
||||
@@ -182,7 +184,6 @@ func main() {
|
||||
lo = initLogger(appName)
|
||||
rdb = initRedis()
|
||||
constants = initConstants()
|
||||
i18n = initI18n(fs)
|
||||
csat = initCSAT(db, i18n)
|
||||
oidc = initOIDC(db, settings, i18n)
|
||||
status = initStatus(db, i18n)
|
||||
@@ -239,7 +240,7 @@ func main() {
|
||||
activityLog: initActivityLog(db, i18n),
|
||||
customAttribute: initCustomAttribute(db, i18n),
|
||||
authz: initAuthz(i18n),
|
||||
view: initView(db),
|
||||
view: initView(db, i18n),
|
||||
report: initReport(db, i18n),
|
||||
csat: initCSAT(db, i18n),
|
||||
search: initSearch(db, i18n),
|
||||
|
||||
Reference in New Issue
Block a user