Skip to content

Commit

Permalink
Merge branch 'main' into v14/chore/bundle-tags-package
Browse files Browse the repository at this point in the history
  • Loading branch information
leekelleher authored Jun 20, 2024
2 parents 75383f5 + 5aa64c5 commit eea4dce
Show file tree
Hide file tree
Showing 18 changed files with 147 additions and 125 deletions.
68 changes: 34 additions & 34 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
"@types/diff": "^5.2.1",
"@types/dompurify": "^3.0.5",
"@types/uuid": "^9.0.8",
"@umbraco-ui/uui": "1.8.1",
"@umbraco-ui/uui": "1.8.2",
"@umbraco-ui/uui-css": "1.8.0",
"base64-js": "^1.5.1",
"diff": "^5.2.0",
Expand Down Expand Up @@ -267,4 +267,4 @@
"access": "public",
"registry": "https://registry.npmjs.org/"
}
}
}
4 changes: 4 additions & 0 deletions src/assets/lang/da-dk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ export default {
selectContentType: 'Vælg indholdstype',
selectMediaStartNode: 'Vælg startnode for mediearkivet',
selectMember: 'Vælg medlem',
selectMembers: 'Vælg medlemmer',
selectMemberGroup: 'Vælg medlemsgruppe',
selectMemberType: 'Vælg medlemstype',
selectNode: 'Vælg node',
Expand Down Expand Up @@ -762,6 +763,7 @@ export default {
deleted: 'Slettet',
deleting: 'Sletter...',
design: 'Design',
details: 'Detaljer',
dictionary: 'Ordbog',
dimensions: 'Dimensioner',
discard: 'Kassér',
Expand Down Expand Up @@ -808,6 +810,7 @@ export default {
message: 'Besked',
move: 'Flyt',
name: 'Navn',
never: 'Aldrig',
new: 'Ny',
next: 'Næste',
no: 'Nej',
Expand Down Expand Up @@ -850,6 +853,7 @@ export default {
submit: 'Indsend',
type: 'Type',
typeToSearch: 'Skriv for at søge...',
unknown: 'Ukendt',
unknownUser: 'Ukendt bruger',
under: 'under',
up: 'Op',
Expand Down
3 changes: 3 additions & 0 deletions src/assets/lang/en-us.ts
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ export default {
selectContentType: 'Select content type',
selectMediaStartNode: 'Select media start node',
selectMember: 'Select member',
selectMembers: 'Select members',
selectMemberGroup: 'Select member group',
selectMemberType: 'Select member type',
selectNode: 'Select node',
Expand Down Expand Up @@ -821,6 +822,7 @@ export default {
message: 'Message',
move: 'Move',
name: 'Name',
never: 'Never',
new: 'New',
next: 'Next',
no: 'No',
Expand Down Expand Up @@ -870,6 +872,7 @@ export default {
type: 'Type',
typeName: 'Type Name',
typeToSearch: 'Type to search...',
unknown: 'Unknown',
unknownUser: 'Unknown user',
under: 'under',
up: 'Up',
Expand Down
3 changes: 3 additions & 0 deletions src/assets/lang/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ export default {
selectContentType: 'Select content type',
selectMediaStartNode: 'Select media start node',
selectMember: 'Select member',
selectMembers: 'Select members',
selectMemberGroup: 'Select member group',
selectMemberType: 'Select member type',
selectNode: 'Select node',
Expand Down Expand Up @@ -830,6 +831,7 @@ export default {
message: 'Message',
move: 'Move',
name: 'Name',
never: 'Never',
new: 'New',
next: 'Next',
no: 'No',
Expand Down Expand Up @@ -879,6 +881,7 @@ export default {
type: 'Type',
typeName: 'Type Name',
typeToSearch: 'Type to search...',
unknown: 'Unknown',
unknownUser: 'Unknown user',
under: 'under',
up: 'Up',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,9 @@ export class UmbInputMarkdownElement extends UUIFormControlMixin(UmbLitElement,
#toolbar {
background-color: var(--uui-color-background-alt);
display: flex;
flex-wrap: wrap;
gap: var(--uui-size-2);
}
#toolbar uui-button-group:last-child {
margin-left: auto;
margin-bottom: var(--uui-size-2);
}
umb-code-editor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class UmbMemberGroupTableCollectionViewElement extends UmbLitElement {
@state()
private _tableColumns: Array<UmbTableColumn> = [
{
name: 'Name',
name: this.localize.term('general_name'),
alias: 'memberGroupName',
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ export class UmbInputMemberGroupElement extends UUIFormControlMixin(UmbLitElemen
${this.#renderOpenButton(item)}
<uui-button @click=${() => this.#removeItem(item)} label=${this.localize.term('general_remove')}></uui-button>
</uui-action-bar>
<umb-icon slot="icon" name="icon-users"></umb-icon>
</uui-ref-node>
`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,19 @@ export class UmbMemberTypeWorkspaceViewMemberInfoElement extends UmbLitElement i

render() {
return html` <div id="left-column">
<uui-box headline="Member Group">
<uui-box headline=${this.localize.term('content_membergroup')}>
<div id="no-properties">
<umb-localize key="member_memberGroupNoProperties"></umb-localize>
<umb-localize key="member_memberGroupNoProperties">
Member groups have no additional properties for editing.
</umb-localize>
</div>
</uui-box>
</div>
<div id="right-column">
<uui-box headline="General">
<uui-box headline=${this.localize.term('general_general')}>
<div class="property">
<b>Id</b>
<b><umb-localize key="general_id">Id</umb-localize></b>
<span>${this._unique}</span>
</div>
</uui-box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class UmbMemberTableCollectionViewElement extends UmbLitElement {
@state()
private _tableColumns: Array<UmbTableColumn> = [
{
name: 'Name',
name: this.localize.term('general_name'),
alias: 'memberName',
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class UmbMemberPickerModalElement extends UmbModalBaseElement<
}

render() {
return html`<umb-body-layout headline="Select members">
return html`<umb-body-layout headline=${this.localize.term('defaultdialogs_selectMembers')}>
<uui-box>
${repeat(
this.#filteredMembers,
Expand All @@ -64,8 +64,12 @@ export class UmbMemberPickerModalElement extends UmbModalBaseElement<
)}
</uui-box>
<div slot="actions">
<uui-button label="Close" @click=${this.#close}></uui-button>
<uui-button label="Submit" look="primary" color="positive" @click=${this.#submit}></uui-button>
<uui-button label=${this.localize.term('general_cancel')} @click=${this.#close}></uui-button>
<uui-button
label=${this.localize.term('general_submit')}
look="primary"
color="positive"
@click=${this.#submit}></uui-button>
</div>
</umb-body-layout> `;
}
Expand Down
2 changes: 1 addition & 1 deletion src/packages/members/member/workspace/manifests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const workspaceViews: Array<ManifestWorkspaceView> = [
js: () => import('./views/member/member-workspace-view-member.element.js'),
weight: 200,
meta: {
label: 'Member',
label: '#treeHeaders_member',
pathname: 'member',
icon: 'icon-user',
},
Expand Down
Loading

0 comments on commit eea4dce

Please sign in to comment.