From 7e9c43261bc8f1fdbe1ddc4bcfa349a32856261c Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Wed, 15 Sep 2021 20:25:19 +0200
Subject: [PATCH] Implement resource translation for compose namespace

---
 compose/service/namespace.go | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/compose/service/namespace.go b/compose/service/namespace.go
index 9b98abb7e..cfa0ddfa1 100644
--- a/compose/service/namespace.go
+++ b/compose/service/namespace.go
@@ -15,6 +15,7 @@ import (
 	"github.com/cortezaproject/corteza-server/pkg/locale"
 	"github.com/cortezaproject/corteza-server/pkg/rbac"
 	"github.com/cortezaproject/corteza-server/store"
+	"golang.org/x/text/language"
 )
 
 type (
@@ -209,6 +210,15 @@ func (svc namespace) Create(ctx context.Context, new *types.Namespace) (*types.N
 			return err
 		}
 
+		if contentLang := locale.GetContentLanguageFromContext(ctx); contentLang != language.Und {
+			tt := new.EncodeTranslations()
+			tt.SetLanguage(contentLang)
+			err = DefaultResourceTranslation.Upsert(ctx, tt)
+			if err != nil {
+				return err
+			}
+		}
+
 		if err = label.Create(ctx, s, new); err != nil {
 			return
 		}
@@ -275,12 +285,13 @@ func (svc namespace) updater(ctx context.Context, namespaceID uint64, action fun
 			}
 		}
 
-		// i18n
-		tt := ns.EncodeTranslations()
-		tt.SetLanguage(locale.GetLanguageFromContext(ctx))
-		err = DefaultResourceTranslation.Upsert(ctx, tt)
-		if err != nil {
-			return err
+		if contentLang := locale.GetContentLanguageFromContext(ctx); contentLang != language.Und {
+			tt := ns.EncodeTranslations()
+			tt.SetLanguage(contentLang)
+			err = DefaultResourceTranslation.Upsert(ctx, tt)
+			if err != nil {
+				return err
+			}
 		}
 
 		if changes&namespaceLabelsChanged > 0 {