Browse Source

Fix flattening for custom language codes.

pull/872/head
Sebastian 4 years ago
parent
commit
a505bf7ba0
  1. 5
      backend/src/Squidex.Domain.Apps.Entities/Contents/ContentExtensions.cs
  2. 4
      backend/tools/TestSuite/TestSuite.ApiTests/ContentLanguageTests.cs
  3. 15
      backend/tools/TestSuite/TestSuite.Shared/Fixtures/CreatedAppFixture.cs

5
backend/src/Squidex.Domain.Apps.Entities/Contents/ContentExtensions.cs

@ -135,10 +135,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
foreach (var iso2Code in value.Split(Separators, StringSplitOptions.RemoveEmptyEntries))
{
if (Language.TryGetLanguage(iso2Code.Trim(), out var language))
{
languages.Add(language);
}
languages.Add(iso2Code);
}
return languages;

4
backend/tools/TestSuite/TestSuite.ApiTests/ContentLanguageTests.cs

@ -43,6 +43,7 @@ namespace TestSuite.ApiTests
[Theory]
[InlineData("de", "Hallo")]
[InlineData("en", "Hello")]
[InlineData("custom", "Custom")]
public async Task Should_flatten_language(string code, string expected)
{
// STEP 1: Create content
@ -51,7 +52,8 @@ namespace TestSuite.ApiTests
Localized = new Dictionary<string, string>
{
["de"] = "Hallo",
["en"] = "Hello"
["en"] = "Hello",
["custom"] = "Custom"
}
}, ContentCreateOptions.AsPublish);

15
backend/tools/TestSuite/TestSuite.Shared/Fixtures/CreatedAppFixture.cs

@ -47,6 +47,21 @@ namespace TestSuite.Fixtures
}
}
try
{
await Apps.PostLanguageAsync(AppName, new AddLanguageDto
{
Language = "custom"
});
}
catch (SquidexManagementException ex)
{
if (ex.StatusCode != 400)
{
throw;
}
}
return true;
});
}

Loading…
Cancel
Save