Skip to content

Commit 62a839b

Browse files
authored
Merge branch 'main' into v14/chore/bundle-document-package
2 parents e5d98f2 + 3f6bb98 commit 62a839b

File tree

18 files changed

+153
-127
lines changed

18 files changed

+153
-127
lines changed

package-lock.json

Lines changed: 37 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@
133133
"./src/packages/language",
134134
"./src/packages/tags",
135135
"./src/packages/umbraco-news",
136-
"./src/packages/webhook"
136+
"./src/packages/webhook",
137+
"./src/packages/health-check",
138+
"./src/packages/tags"
137139
],
138140
"scripts": {
139141
"backoffice:test:e2e": "npx playwright test",
@@ -187,7 +189,7 @@
187189
"@types/diff": "^5.2.1",
188190
"@types/dompurify": "^3.0.5",
189191
"@types/uuid": "^9.0.8",
190-
"@umbraco-ui/uui": "1.8.1",
192+
"@umbraco-ui/uui": "1.8.2",
191193
"@umbraco-ui/uui-css": "1.8.0",
192194
"base64-js": "^1.5.1",
193195
"diff": "^5.2.0",
@@ -268,4 +270,4 @@
268270
"access": "public",
269271
"registry": "https://registry.npmjs.org/"
270272
}
271-
}
273+
}

src/assets/lang/da-dk.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ export default {
538538
selectContentType: 'Vælg indholdstype',
539539
selectMediaStartNode: 'Vælg startnode for mediearkivet',
540540
selectMember: 'Vælg medlem',
541+
selectMembers: 'Vælg medlemmer',
541542
selectMemberGroup: 'Vælg medlemsgruppe',
542543
selectMemberType: 'Vælg medlemstype',
543544
selectNode: 'Vælg node',
@@ -762,6 +763,7 @@ export default {
762763
deleted: 'Slettet',
763764
deleting: 'Sletter...',
764765
design: 'Design',
766+
details: 'Detaljer',
765767
dictionary: 'Ordbog',
766768
dimensions: 'Dimensioner',
767769
discard: 'Kassér',
@@ -808,6 +810,7 @@ export default {
808810
message: 'Besked',
809811
move: 'Flyt',
810812
name: 'Navn',
813+
never: 'Aldrig',
811814
new: 'Ny',
812815
next: 'Næste',
813816
no: 'Nej',
@@ -850,6 +853,7 @@ export default {
850853
submit: 'Indsend',
851854
type: 'Type',
852855
typeToSearch: 'Skriv for at søge...',
856+
unknown: 'Ukendt',
853857
unknownUser: 'Ukendt bruger',
854858
under: 'under',
855859
up: 'Op',

src/assets/lang/en-us.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,7 @@ export default {
549549
selectContentType: 'Select content type',
550550
selectMediaStartNode: 'Select media start node',
551551
selectMember: 'Select member',
552+
selectMembers: 'Select members',
552553
selectMemberGroup: 'Select member group',
553554
selectMemberType: 'Select member type',
554555
selectNode: 'Select node',
@@ -821,6 +822,7 @@ export default {
821822
message: 'Message',
822823
move: 'Move',
823824
name: 'Name',
825+
never: 'Never',
824826
new: 'New',
825827
next: 'Next',
826828
no: 'No',
@@ -870,6 +872,7 @@ export default {
870872
type: 'Type',
871873
typeName: 'Type Name',
872874
typeToSearch: 'Type to search...',
875+
unknown: 'Unknown',
873876
unknownUser: 'Unknown user',
874877
under: 'under',
875878
up: 'Up',

src/assets/lang/en.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ export default {
560560
selectContentType: 'Select content type',
561561
selectMediaStartNode: 'Select media start node',
562562
selectMember: 'Select member',
563+
selectMembers: 'Select members',
563564
selectMemberGroup: 'Select member group',
564565
selectMemberType: 'Select member type',
565566
selectNode: 'Select node',
@@ -830,6 +831,7 @@ export default {
830831
message: 'Message',
831832
move: 'Move',
832833
name: 'Name',
834+
never: 'Never',
833835
new: 'New',
834836
next: 'Next',
835837
no: 'No',
@@ -879,6 +881,7 @@ export default {
879881
type: 'Type',
880882
typeName: 'Type Name',
881883
typeToSearch: 'Type to search...',
884+
unknown: 'Unknown',
882885
unknownUser: 'Unknown user',
883886
under: 'under',
884887
up: 'Up',

src/packages/markdown-editor/components/input-markdown-editor/input-markdown.element.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,11 +561,9 @@ export class UmbInputMarkdownElement extends UUIFormControlMixin(UmbLitElement,
561561
#toolbar {
562562
background-color: var(--uui-color-background-alt);
563563
display: flex;
564+
flex-wrap: wrap;
564565
gap: var(--uui-size-2);
565-
}
566-
567-
#toolbar uui-button-group:last-child {
568-
margin-left: auto;
566+
margin-bottom: var(--uui-size-2);
569567
}
570568
571569
umb-code-editor {

src/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class UmbMemberGroupTableCollectionViewElement extends UmbLitElement {
1616
@state()
1717
private _tableColumns: Array<UmbTableColumn> = [
1818
{
19-
name: 'Name',
19+
name: this.localize.term('general_name'),
2020
alias: 'memberGroupName',
2121
},
2222
];

src/packages/members/member-group/components/input-member-group/input-member-group.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ export class UmbInputMemberGroupElement extends UUIFormControlMixin(UmbLitElemen
182182
${this.#renderOpenButton(item)}
183183
<uui-button @click=${() => this.#removeItem(item)} label=${this.localize.term('general_remove')}></uui-button>
184184
</uui-action-bar>
185+
<umb-icon slot="icon" name="icon-users"></umb-icon>
185186
</uui-ref-node>
186187
`;
187188
}

src/packages/members/member-group/workspace/views/info/member-type-workspace-view-info.element.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@ export class UmbMemberTypeWorkspaceViewMemberInfoElement extends UmbLitElement i
2323

2424
render() {
2525
return html` <div id="left-column">
26-
<uui-box headline="Member Group">
26+
<uui-box headline=${this.localize.term('content_membergroup')}>
2727
<div id="no-properties">
28-
<umb-localize key="member_memberGroupNoProperties"></umb-localize>
28+
<umb-localize key="member_memberGroupNoProperties">
29+
Member groups have no additional properties for editing.
30+
</umb-localize>
2931
</div>
3032
</uui-box>
3133
</div>
3234
3335
<div id="right-column">
34-
<uui-box headline="General">
36+
<uui-box headline=${this.localize.term('general_general')}>
3537
<div class="property">
36-
<b>Id</b>
38+
<b><umb-localize key="general_id">Id</umb-localize></b>
3739
<span>${this._unique}</span>
3840
</div>
3941
</uui-box>

src/packages/members/member/collection/views/table/member-table-collection-view.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class UmbMemberTableCollectionViewElement extends UmbLitElement {
1616
@state()
1717
private _tableColumns: Array<UmbTableColumn> = [
1818
{
19-
name: 'Name',
19+
name: this.localize.term('general_name'),
2020
alias: 'memberName',
2121
},
2222
];

0 commit comments

Comments
 (0)