Skip to content

Commit

Permalink
Bugfix before release
Browse files Browse the repository at this point in the history
  • Loading branch information
rickbutterfield committed Feb 7, 2025
1 parent a6a2e61 commit 2003722
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 3 deletions.
9 changes: 9 additions & 0 deletions src/Umbraco.Cms.15.x/uSync/v15/Domains/_en-us.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Domain Key="cdcab783-0000-0000-0000-000000000000" Alias="/">
<Info>
<IsWildcard>false</IsWildcard>
<Language>en-US</Language>
<Root Key="6e2ff1f7-114e-484b-a407-918daded1aa6">/Home</Root>
<SortOrder>0</SortOrder>
</Info>
</Domain>
9 changes: 9 additions & 0 deletions src/Umbraco.Cms.15.x/uSync/v15/Domains/uk_en-gb.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Domain Key="350111b1-0000-0000-0000-000000000000" Alias="/uk">
<Info>
<IsWildcard>false</IsWildcard>
<Language>en-GB</Language>
<Root Key="6e2ff1f7-114e-484b-a407-918daded1aa6">/Home</Root>
<SortOrder>1</SortOrder>
</Info>
</Domain>
8 changes: 8 additions & 0 deletions src/Umbraco.Cms.15.x/uSync/v15/Languages/en-gb.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Language Key="5e8dc56b-0000-0000-0000-000000000000" Alias="en-GB" Level="0">
<Name>English (United Kingdom)</Name>
<IsoCode>en-GB</IsoCode>
<IsMandatory>false</IsMandatory>
<IsDefault>false</IsDefault>
<Fallback>en-US</Fallback>
</Language>
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public async Task<string> RenderGridBlock(
if (matchingBlockConfig == null)
return string.Format(Constants.ErrorMessages.ErrorTemplate, Constants.ErrorMessages.InvalidMatchingBlockGridConfiguration);

ConfigureBlockInstanceAreas(blockInstance, config, matchingBlockConfig, matchingLayout!, blockValue!, content, documentTypeUnique, blockEditorAlias);
ConfigureBlockInstanceAreas(blockInstance, config, matchingBlockConfig, matchingLayout!);

ViewDataDictionary viewData = CreateViewData(blockInstance, BlockType.BlockGrid, matchingBlockConfig);
return await GetMarkup(controllerContext, contentElement?.ContentType.Alias, viewData, BlockType.BlockGrid);
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

0 comments on commit 2003722

Please sign in to comment.