jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve default theme wording (#17336)

Browse Source 
* Improve default theme wording

* Remove home assistant translation
This commit is contained in:
Paul Bottein 2023-07-18 15:22:20 +02:00 committed by GitHub
parent 000288aecb
commit 4a044fc40e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/ha-theme-picker.ts
View File

@ -42,17 +42,15 @@ export class HaThemePicker extends LitElement {
fixedMenuPosition
naturalMenuWidth
>
<mwc-list-item value="remove"
>${this.hass!.localize(
"ui.components.theme-picker.no_theme"
)}</mwc-list-item
>
<mwc-list-item value="remove">
${this.hass!.localize("ui.components.theme-picker.no_theme")}
</mwc-list-item>
${this.includeDefault
? html`<mwc-list-item .value=${DEFAULT_THEME}
>${this.hass!.localize(
"ui.components.theme-picker.default"
)}</mwc-list-item
>`
? html`
<mwc-list-item .value=${DEFAULT_THEME}>
Home Assistant
</mwc-list-item>
`
: nothing}
${Object.keys(this.hass!.themes.themes)
.sort()

21
src/panels/profile/ha-pick-theme-row.ts
View File

@ -23,8 +23,8 @@ import {
import { HomeAssistant } from "../../types";
import { documentationUrl } from "../../util/documentation-url";
const BACKEND_SELECTED_THEME = "Backend-selected";
const DEFAULT_THEME = "default";
const USE_DEFAULT_THEME = "__USE_DEFAULT_THEME__";
const HOME_ASSISTANT_THEME = "default";
@customElement("ha-pick-theme-row")
export class HaPickThemeRow extends LitElement {
@ -68,15 +68,15 @@ export class HaPickThemeRow extends LitElement {
<ha-select
.label=${this.hass.localize("ui.panel.profile.themes.dropdown_label")}
.disabled=${!hasThemes}
.value=${this.hass.selectedTheme?.theme || BACKEND_SELECTED_THEME}
.value=${this.hass.selectedTheme?.theme || USE_DEFAULT_THEME}
@selected=${this._handleThemeSelection}
naturalMenuWidth
>
<mwc-list-item .value=${BACKEND_SELECTED_THEME}>
${this.hass.localize("ui.panel.profile.themes.backend-selected")}
<mwc-list-item .value=${USE_DEFAULT_THEME}>
${this.hass.localize("ui.panel.profile.themes.use_default")}
</mwc-list-item>
<mwc-list-item .value=${DEFAULT_THEME}>
${this.hass.localize("ui.panel.profile.themes.default")}
<mwc-list-item .value=${HOME_ASSISTANT_THEME}>
Home Assistant
</mwc-list-item>
${this._themeNames.map(
(theme) => html`
@ -85,7 +85,8 @@ export class HaPickThemeRow extends LitElement {
)}
</ha-select>
</ha-settings-row>
${curTheme === DEFAULT_THEME || this._supportsModeSelection(curTheme)
${curTheme === HOME_ASSISTANT_THEME ||
this._supportsModeSelection(curTheme)
? html` <div class="inputs">
<ha-formfield
.label=${this.hass.localize(
@ -125,7 +126,7 @@ export class HaPickThemeRow extends LitElement {
>
</ha-radio>
</ha-formfield>
${curTheme === DEFAULT_THEME
${curTheme === HOME_ASSISTANT_THEME
? html`<div class="color-pickers">
<ha-textfield
.value=${themeSettings?.primaryColor ||
@ -207,7 +208,7 @@ export class HaPickThemeRow extends LitElement {
return;
}
if (theme === BACKEND_SELECTED_THEME) {
if (theme === USE_DEFAULT_THEME) {
if (this.hass.selectedTheme?.theme) {
fireEvent(this, "settheme", {
theme: "",

6
src/translations/en.json
View File

@ -403,8 +403,7 @@
},
"theme-picker": {
"theme": "Theme",
"no_theme": "No theme",
"default": "[%key:ui::panel::profile::themes::default%]"
"no_theme": "No theme"
},
"language-picker": {
"language": "Language",
@ -5194,8 +5193,7 @@
"primary_color": "Primary color",
"accent_color": "Accent color",
"reset": "Reset",
"backend-selected": "Use backend preferred theme",
"default": "Default"
"use_default": "Use default theme"
},
"dashboard": {
"header": "Dashboard",