Skip to content

Move ZHA config panel section translations to the backend #49816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 3 commits into from
Apr 30, 2021
Merged

Move ZHA config panel section translations to the backend #49816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9457c7e
Move custom ZHA config translations to the backend
dmulcahey Apr 28, 2021
4e40ff4
change schema
dmulcahey Apr 28, 2021
cd1f7e8
update schema
dmulcahey Apr 28, 2021
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
13 changes: 13 additions & 0 deletions homeassistant/components/zha/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
"single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
}
},
"config_panel": {
Copy link
Copy Markdown
Member

@balloob balloob Apr 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that this makes sense as long as the actual panel code lives in the frontend. Or are these strings passed to the frontend from the backend?

CC @bramkragten

Copy link
Copy Markdown
Member

@bramkragten bramkragten Apr 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They use ha-form and get the actual data/fields from the backend, so I think it makes sense to have the translations on the backend.

Copy link
Copy Markdown
Contributor Author

@dmulcahey dmulcahey Apr 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@balloob are we good with this now?

Copy link
Copy Markdown
Member

@balloob balloob Apr 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

"zha_options": {
"title": "Global Options",
"enable_identify_on_join": "Enable identify effect when devices join the network",
"default_light_transition": "Default light transition time (seconds)"
},
"zha_alarm_options": {
"title": "Alarm Control Panel Options",
"alarm_master_code": "Master code for the alarm control panel(s)",
"alarm_failed_tries": "The number of consecutive failed code entries to trigger an alarm",
"alarm_arm_requires_code": "Code required for arming actions"
}
},
"device_automation": {
"action_type": { "squawk": "Squawk", "warn": "Warn" },
"trigger_type": {
Expand Down
13 changes: 13 additions & 0 deletions homeassistant/components/zha/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
}
}
},
"config_panel": {
"zha_alarm_options": {
"alarm_arm_requires_code": "Code required for arming actions",
"alarm_failed_tries": "The number of consecutive failed code entries to trigger an alarm",
"alarm_master_code": "Master code for the alarm control panel(s)",
"title": "Alarm Control Panel Options"
},
"zha_options": {
"default_light_transition": "Default light transition time (seconds)",
"enable_identify_on_join": "Enable identify effect when devices join the network",
"title": "Global Options"
}
},
"device_automation": {
"action_type": {
"squawk": "Squawk",
Expand Down
6 changes: 6 additions & 0 deletions script/hassfest/translations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ def gen_strings_schema(config: Config, integration: Integration):
vol.Optional("system_health"): {
vol.Optional("info"): {str: cv.string_with_no_html}
},
vol.Optional("config_panel"): cv.schema_with_slug_keys(
cv.schema_with_slug_keys(
cv.string_with_no_html, slug_validator=lowercase_validator
),
slug_validator=vol.Any("_", cv.slug),
),
}
)

Expand Down