Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class DialogConfigEntrySystemOptions extends LitElement {
.disabled=${this._submitting}
>
${this.hass.localize(
"ui.panel.config.entity_registry.editor.update"
"ui.panel.config.entities.editor.update"
)}
</mwc-button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ class DialogDeviceRegistryDetail extends LitElement {
</paper-dialog-scrollable>
<div class="paper-dialog-buttons">
<mwc-button @click="${this._updateEntry}">
${this.hass.localize(
"ui.panel.config.entity_registry.editor.update"
)}
${this.hass.localize("ui.panel.config.entities.editor.update")}
</mwc-button>
</div>
</ha-paper-dialog>
Expand Down
16 changes: 4 additions & 12 deletions src/panels/config/areas/dialog-area-registry-detail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ class DialogAreaDetail extends LitElement {
<h2>
${entry
? entry.name
: this.hass.localize(
"ui.panel.config.area_registry.editor.default_name"
)}
: this.hass.localize("ui.panel.config.areas.editor.default_name")}
</h2>
<paper-dialog-scrollable>
${this._error
Expand Down Expand Up @@ -81,9 +79,7 @@ class DialogAreaDetail extends LitElement {
@click="${this._deleteEntry}"
.disabled=${this._submitting}
>
${this.hass.localize(
"ui.panel.config.area_registry.editor.delete"
)}
${this.hass.localize("ui.panel.config.areas.editor.delete")}
</mwc-button>
`
: html``}
Expand All @@ -92,12 +88,8 @@ class DialogAreaDetail extends LitElement {
.disabled=${nameInvalid || this._submitting}
>
${entry
? this.hass.localize(
"ui.panel.config.area_registry.editor.update"
)
: this.hass.localize(
"ui.panel.config.area_registry.editor.create"
)}
? this.hass.localize("ui.panel.config.areas.editor.update")
: this.hass.localize("ui.panel.config.areas.editor.create")}
</mwc-button>
</div>
</ha-paper-dialog>
Expand Down
24 changes: 8 additions & 16 deletions src/panels/config/areas/ha-config-areas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,23 @@ export class HaConfigAreas extends LitElement {
}
return html`
<hass-subpage
.header="${this.hass.localize("ui.panel.config.area_registry.caption")}"
.header="${this.hass.localize("ui.panel.config.areas.caption")}"
.showBackButton=${!this.isWide}
>
<ha-config-section .isWide=${this.isWide}>
<span slot="header">
${this.hass.localize("ui.panel.config.area_registry.picker.header")}
${this.hass.localize("ui.panel.config.areas.picker.header")}
</span>
<span slot="introduction">
${this.hass.localize(
"ui.panel.config.area_registry.picker.introduction"
)}
${this.hass.localize("ui.panel.config.areas.picker.introduction")}
<p>
${this.hass.localize(
"ui.panel.config.area_registry.picker.introduction2"
"ui.panel.config.areas.picker.introduction2"
)}
</p>
<a href="/config/integrations/dashboard">
${this.hass.localize(
"ui.panel.config.area_registry.picker.integrations_page"
"ui.panel.config.areas.picker.integrations_page"
)}
</a>
</span>
Expand All @@ -88,13 +86,9 @@ export class HaConfigAreas extends LitElement {
${this._areas.length === 0
? html`
<div class="empty">
${this.hass.localize(
"ui.panel.config.area_registry.no_areas"
)}
${this.hass.localize("ui.panel.config.areas.no_areas")}
<mwc-button @click=${this._createArea}>
${this.hass.localize(
"ui.panel.config.area_registry.create_area"
)}
${this.hass.localize("ui.panel.config.areas.create_area")}
</mwc-button>
</div>
`
Expand All @@ -106,9 +100,7 @@ export class HaConfigAreas extends LitElement {
<ha-fab
?is-wide=${this.isWide}
icon="hass:plus"
title="${this.hass.localize(
"ui.panel.config.area_registry.create_area"
)}"
title="${this.hass.localize("ui.panel.config.areas.create_area")}"
@click=${this._createArea}
class="${classMap({
rtl: computeRTL(this.hass),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class HaDeviceEntitiesCard extends LitElement {
?checked=${this._showDisabled}
@change=${this._showDisabledChanged}
>${this.hass.localize(
"ui.panel.config.entity_registry.picker.show_disabled"
"ui.panel.config.entities.picker.show_disabled"
)}
</ha-switch>
</paper-item>
Expand Down
20 changes: 8 additions & 12 deletions src/panels/config/entities/dialog-entity-registry-detail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class DialogEntityRegistryDetail extends LitElement {
? html`
<div>
${this.hass!.localize(
"ui.panel.config.entity_registry.editor.unavailable"
"ui.panel.config.entities.editor.unavailable"
)}
</div>
`
Expand Down Expand Up @@ -112,24 +112,24 @@ class DialogEntityRegistryDetail extends LitElement {
<div>
<div>
${this.hass.localize(
"ui.panel.config.entity_registry.editor.enabled_label"
"ui.panel.config.entities.editor.enabled_label"
)}
</div>
<div class="secondary">
${this._disabledBy && this._disabledBy !== "user"
? this.hass.localize(
"ui.panel.config.entity_registry.editor.enabled_cause",
"ui.panel.config.entities.editor.enabled_cause",
"cause",
this.hass.localize(
`config_entry.disabled_by.${this._disabledBy}`
)
)
: ""}
${this.hass.localize(
"ui.panel.config.entity_registry.editor.enabled_description"
"ui.panel.config.entities.editor.enabled_description"
)}
<br />${this.hass.localize(
"ui.panel.config.entity_registry.editor.note"
"ui.panel.config.entities.editor.note"
)}
</div>
</div>
Expand All @@ -144,17 +144,13 @@ class DialogEntityRegistryDetail extends LitElement {
.disabled=${this._submitting ||
!(stateObj && stateObj.attributes.restored)}
>
${this.hass.localize(
"ui.panel.config.entity_registry.editor.delete"
)}
${this.hass.localize("ui.panel.config.entities.editor.delete")}
</mwc-button>
<mwc-button
@click="${this._updateEntry}"
.disabled=${invalidDomainUpdate || this._submitting}
>
${this.hass.localize(
"ui.panel.config.entity_registry.editor.update"
)}
${this.hass.localize("ui.panel.config.entities.editor.update")}
</mwc-button>
</div>
</ha-paper-dialog>
Expand Down Expand Up @@ -201,7 +197,7 @@ class DialogEntityRegistryDetail extends LitElement {
private _confirmDeleteEntry(): void {
showConfirmationDialog(this, {
text: this.hass.localize(
"ui.panel.config.entity_registry.editor.confirm_delete"
"ui.panel.config.entities.editor.confirm_delete"
),
confirm: () => this._deleteEntry(),
});
Expand Down
Loading