1) Correct language displayed in Content overview

2) Invariant language becomes master language.

src/Squidex.Core/Contents/ContentData.cs

@@ -152,6 +152,10 @@ namespace Squidex.Core.Contents
                         {
                             fieldResult.Add(languageCode, value);
                         }
+                        else if (language.Equals(masterLanguage) && fieldValues.TryGetValue(invariantCode, out value))
+                        {
+                            fieldResult.Add(languageCode, value);
+                        }
                     }
                 }
                 else

src/Squidex/app/features/content/pages/contents/content-item.component.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
 
 import {
     AppComponentBase,
@@ -28,7 +28,7 @@ import {
         fadeAnimation
     ]
 })
-export class ContentItemComponent extends AppComponentBase implements OnInit {
+export class ContentItemComponent extends AppComponentBase implements OnInit, OnChanges {
     public dropdown = new ModalView(false, true);
 
     @Output()
@@ -58,7 +58,15 @@ export class ContentItemComponent extends AppComponentBase implements OnInit {
         super(notifications, users, apps);
     }
 
+    public ngOnChanges() {
+        this.updateValues();
+    }
+
     public ngOnInit() {
+        this.updateValues();
+    }
+
+    private updateValues() {
         this.values = [];
 
         for (let field of this.fields) {

tests/Squidex.Core.Tests/Contents/ContentDataTests.cs

@@ -157,6 +157,26 @@ namespace Squidex.Core.Contents
             Assert.Equal(expected, actual);
         }
 
+        [Fact]
+        public void Should_provide_master_language_from_invariant()
+        {
+            var expected =
+                new ContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("en", 3));
+
+            var input =
+                new ContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("iv", 3));
+
+            var actual = input.ToApiModel(schema, languages, masterLanguage);
+
+            Assert.Equal(expected, actual);
+        }
+
         [Fact]
         public void Should_remove_null_values_when_cleaning()
         {

tests/Squidex.Infrastructure.Tests/RefTokenTests.cs

@@ -89,7 +89,7 @@ namespace Squidex.Infrastructure
             object token1a = RefToken.Parse("client:client1");
             object token1b = RefToken.Parse("client:client1");
             object token2a  = RefToken.Parse("client:client2");
-
+            
             Assert.True(token1a.Equals(token1b));
 
             Assert.False(token1a.Equals(token2a));