From 31cabc1f29bdbea3524a19e491f8b3755fceb29c Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Wed, 22 Jan 2020 22:18:56 +0100
Subject: [PATCH] Always use master language first.

---
 .../features/content/pages/content/content-page.component.ts   | 2 +-
 .../features/content/pages/contents/contents-page.component.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/app/features/content/pages/content/content-page.component.ts b/frontend/app/features/content/pages/content/content-page.component.ts
index 6034f6818..852bc557e 100644
--- a/frontend/app/features/content/pages/content/content-page.component.ts
+++ b/frontend/app/features/content/pages/content/content-page.component.ts
@@ -93,7 +93,7 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD
             this.languagesState.languages
                 .subscribe(languages => {
                     this.languages = languages.map(x => x.language);
-                    this.language = this.languages[0];
+                    this.language = this.languages.find(x => x.isMaster)!;
                 }));
 
         this.own(
diff --git a/frontend/app/features/content/pages/contents/contents-page.component.ts b/frontend/app/features/content/pages/contents/contents-page.component.ts
index 695e3b139..33be749eb 100644
--- a/frontend/app/features/content/pages/contents/contents-page.component.ts
+++ b/frontend/app/features/content/pages/contents/contents-page.component.ts
@@ -106,8 +106,7 @@ export class ContentsPageComponent extends ResourceOwner implements OnInit {
             this.languagesState.languages
                 .subscribe(languages => {
                     this.languages = languages.map(x => x.language);
-                    this.language = this.languages[0];
-                    this.languageMaster = this.languages.find(x => x.isMaster)!;
+                    this.language = this.languages.find(x => x.isMaster)!;
 
                     this.updateModel();
                 }));