From 0173c61fee0726f01f77a5178457224d406881eb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 13 Feb 2020 17:27:00 +0100 Subject: [PATCH] Spelling: Config(uration) (#31782) --- homeassistant/components/axis/strings.json | 52 +++++++++---------- homeassistant/components/bom/sensor.py | 2 +- homeassistant/components/config/manifest.json | 2 +- .../components/ecobee/config_flow.py | 2 +- .../eddystone_temperature/sensor.py | 2 +- homeassistant/components/emoncms/sensor.py | 2 +- homeassistant/components/harmony/remote.py | 2 +- .../homekit_controller/config_flow.py | 2 +- .../homekit_controller/strings.json | 2 +- homeassistant/components/mqtt/__init__.py | 2 +- homeassistant/components/octoprint/sensor.py | 2 +- .../components/pandora/media_player.py | 4 +- homeassistant/components/plex/strings.json | 2 +- .../components/smartthings/__init__.py | 6 +-- .../components/sonos/media_player.py | 2 +- homeassistant/components/vizio/strings.json | 2 +- homeassistant/components/zwave/__init__.py | 10 ++-- homeassistant/config_entries.py | 8 +-- homeassistant/loader.py | 2 +- tests/auth/test_init.py | 4 +- 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/homeassistant/components/axis/strings.json b/homeassistant/components/axis/strings.json index b50a5c546b8..04a9f9e388a 100644 --- a/homeassistant/components/axis/strings.json +++ b/homeassistant/components/axis/strings.json @@ -1,29 +1,29 @@ { - "config": { - "title": "Axis device", - "flow_title": "Axis device: {name} ({host})", - "step": { - "user": { - "title": "Set up Axis device", - "data": { - "host": "Host", - "username": "Username", - "password": "Password", - "port": "Port" - } - } - }, - "error": { - "already_configured": "Device is already configured", - "already_in_progress": "Config flow for device is already in progress.", - "device_unavailable": "Device is not available", - "faulty_credentials": "Bad user credentials" - }, - "abort": { - "already_configured": "Device is already configured", - "bad_config_file": "Bad data from config file", - "link_local_address": "Link local addresses are not supported", - "not_axis_device": "Discovered device not an Axis device" + "config": { + "title": "Axis device", + "flow_title": "Axis device: {name} ({host})", + "step": { + "user": { + "title": "Set up Axis device", + "data": { + "host": "Host", + "username": "Username", + "password": "Password", + "port": "Port" } + } + }, + "error": { + "already_configured": "Device is already configured", + "already_in_progress": "Config flow for device is already in progress.", + "device_unavailable": "Device is not available", + "faulty_credentials": "Bad user credentials" + }, + "abort": { + "already_configured": "Device is already configured", + "bad_config_file": "Bad data from configuration file", + "link_local_address": "Link local addresses are not supported", + "not_axis_device": "Discovered device not an Axis device" } -} \ No newline at end of file + } +} diff --git a/homeassistant/components/bom/sensor.py b/homeassistant/components/bom/sensor.py index 4728e22c877..bd57e20edaa 100644 --- a/homeassistant/components/bom/sensor.py +++ b/homeassistant/components/bom/sensor.py @@ -112,7 +112,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): if station is not None: if zone_id and wmo_id: _LOGGER.warning( - "Using config %s, not %s and %s for BOM sensor", + "Using configuration %s, not %s and %s for BOM sensor", CONF_STATION, CONF_ZONE_ID, CONF_WMO_ID, diff --git a/homeassistant/components/config/manifest.json b/homeassistant/components/config/manifest.json index 809db4ffecc..5d5db4b0741 100644 --- a/homeassistant/components/config/manifest.json +++ b/homeassistant/components/config/manifest.json @@ -1,6 +1,6 @@ { "domain": "config", - "name": "Config", + "name": "Configuration", "documentation": "https://www.home-assistant.io/integrations/config", "requirements": [], "dependencies": ["http"], diff --git a/homeassistant/components/ecobee/config_flow.py b/homeassistant/components/ecobee/config_flow.py index bb406d81e3a..cbe16832a34 100644 --- a/homeassistant/components/ecobee/config_flow.py +++ b/homeassistant/components/ecobee/config_flow.py @@ -107,7 +107,7 @@ class EcobeeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): if await self.hass.async_add_executor_job(ecobee.refresh_tokens): # Credentials found and validated; create the entry. _LOGGER.debug( - "Valid ecobee configuration found for import, creating config entry" + "Valid ecobee configuration found for import, creating configuration entry" ) return self.async_create_entry( title=DOMAIN, diff --git a/homeassistant/components/eddystone_temperature/sensor.py b/homeassistant/components/eddystone_temperature/sensor.py index 22d3533d32f..3b5aa95701f 100644 --- a/homeassistant/components/eddystone_temperature/sensor.py +++ b/homeassistant/components/eddystone_temperature/sensor.py @@ -91,7 +91,7 @@ def get_from_conf(config, config_key, length): string = config.get(config_key) if len(string) != length: _LOGGER.error( - "Error in config parameter %s: Must be exactly %d " + "Error in configuration parameter %s: Must be exactly %d " "bytes. Device will not be added", config_key, length / 2, diff --git a/homeassistant/components/emoncms/sensor.py b/homeassistant/components/emoncms/sensor.py index 34063e4c253..f956d3a7295 100644 --- a/homeassistant/components/emoncms/sensor.py +++ b/homeassistant/components/emoncms/sensor.py @@ -246,7 +246,7 @@ class EmonCmsData: self.data = req.json() else: _LOGGER.error( - "Please verify if the specified config value " + "Please verify if the specified configuration value " "'%s' is correct! (HTTP Status_code = %d)", CONF_URL, req.status_code, diff --git a/homeassistant/components/harmony/remote.py b/homeassistant/components/harmony/remote.py index c48d5fb00b0..bcc9d72ad08 100644 --- a/homeassistant/components/harmony/remote.py +++ b/homeassistant/components/harmony/remote.py @@ -397,7 +397,7 @@ class HarmonyRemote(remote.RemoteDevice): def write_config_file(self): """Write Harmony configuration file.""" _LOGGER.debug( - "%s: Writing hub config to file: %s", self.name, self._config_path + "%s: Writing hub configuration to file: %s", self.name, self._config_path ) if self._client.config is None: _LOGGER.warning("%s: No configuration received from hub", self.name) diff --git a/homeassistant/components/homekit_controller/config_flow.py b/homeassistant/components/homekit_controller/config_flow.py index 507a5cbb70a..7560f0d3a5d 100644 --- a/homeassistant/components/homekit_controller/config_flow.py +++ b/homeassistant/components/homekit_controller/config_flow.py @@ -262,7 +262,7 @@ class HomekitControllerFlowHandler(config_entries.ConfigFlow): _LOGGER.info( ( "Legacy configuration %s for homekit" - "accessory migrated to config entries" + "accessory migrated to configuration entries" ), hkid, ) diff --git a/homeassistant/components/homekit_controller/strings.json b/homeassistant/components/homekit_controller/strings.json index b51dcb1f6d8..55718e35b59 100644 --- a/homeassistant/components/homekit_controller/strings.json +++ b/homeassistant/components/homekit_controller/strings.json @@ -32,7 +32,7 @@ "already_paired": "This accessory is already paired to another device. Please reset the accessory and try again.", "ignored_model": "HomeKit support for this model is blocked as a more feature complete native integration is available.", "already_configured": "Accessory is already configured with this controller.", - "invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting config entry for it in Home Assistant that must first be removed.", + "invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting configuration entry for it in Home Assistant that must first be removed.", "accessory_not_found_error": "Cannot add pairing as device can no longer be found.", "already_in_progress": "Config flow for device is already in progress." } diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py index f64c643f0f4..6780a33c7d7 100644 --- a/homeassistant/components/mqtt/__init__.py +++ b/homeassistant/components/mqtt/__init__.py @@ -568,7 +568,7 @@ async def async_setup_entry(hass, entry): conf = CONFIG_SCHEMA({DOMAIN: entry.data})[DOMAIN] elif any(key in conf for key in entry.data): _LOGGER.warning( - "Data in your config entry is going to override your " + "Data in your configuration entry is going to override your " "configuration.yaml: %s", entry.data, ) diff --git a/homeassistant/components/octoprint/sensor.py b/homeassistant/components/octoprint/sensor.py index d21aac9ff65..98d878fc2ea 100644 --- a/homeassistant/components/octoprint/sensor.py +++ b/homeassistant/components/octoprint/sensor.py @@ -32,7 +32,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): "If you do not want to have your printer on
" " at all times, and you would like to monitor
" "temperatures, please add
" - "bed and/or number_of_tools to your config
" + "bed and/or number_of_tools to your configuration
" "and restart.", title=NOTIFICATION_TITLE, notification_id=NOTIFICATION_ID, diff --git a/homeassistant/components/pandora/media_player.py b/homeassistant/components/pandora/media_player.py index 417903c46e0..07f697a5a46 100644 --- a/homeassistant/components/pandora/media_player.py +++ b/homeassistant/components/pandora/media_player.py @@ -119,8 +119,8 @@ class PandoraMediaPlayer(MediaPlayerDevice): elif mode == 2: _LOGGER.warning( "The pianobar client is not configured to log in. " - "Please create a config file for it as described at " - "https://home-assistant.io/components/media_player.pandora/" + "Please create a configuration file for it as described at " + "https://home-assistant.io/integrations/pandora/" ) # pass through the email/password prompts to quit cleanly self._pianobar.sendcontrol("m") diff --git a/homeassistant/components/plex/strings.json b/homeassistant/components/plex/strings.json index b6491db350c..39abbcf9c6f 100644 --- a/homeassistant/components/plex/strings.json +++ b/homeassistant/components/plex/strings.json @@ -23,7 +23,7 @@ "all_configured": "All linked servers already configured", "already_configured": "This Plex server is already configured", "already_in_progress": "Plex is being configured", - "discovery_no_file": "No legacy config file found", + "discovery_no_file": "No legacy configuration file found", "invalid_import": "Imported configuration is invalid", "non-interactive": "Non-interactive import", "token_request_timeout": "Timed out obtaining token", diff --git a/homeassistant/components/smartthings/__init__.py b/homeassistant/components/smartthings/__init__.py index 33f9558023d..1539fa076e4 100644 --- a/homeassistant/components/smartthings/__init__.py +++ b/homeassistant/components/smartthings/__init__.py @@ -146,7 +146,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): except ClientResponseError as ex: if ex.status in (401, 403): _LOGGER.exception( - "Unable to setup config entry '%s' - please reconfigure the integration", + "Unable to setup configuration entry '%s' - please reconfigure the integration", entry.title, ) remove_entry = True @@ -183,7 +183,7 @@ async def async_get_entry_scenes(entry: ConfigEntry, api): except ClientResponseError as ex: if ex.status == 403: _LOGGER.exception( - "Unable to load scenes for config entry '%s' because the access token does not have the required access", + "Unable to load scenes for configuration entry '%s' because the access token does not have the required access", entry.title, ) else: @@ -230,7 +230,7 @@ async def async_remove_entry(hass: HomeAssistantType, entry: ConfigEntry) -> Non app_count = sum(1 for entry in all_entries if entry.data[CONF_APP_ID] == app_id) if app_count > 1: _LOGGER.debug( - "App %s was not removed because it is in use by other config entries", + "App %s was not removed because it is in use by other configuration entries", app_id, ) return diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py index 97d03e2116e..84920b6c94d 100644 --- a/homeassistant/components/sonos/media_player.py +++ b/homeassistant/components/sonos/media_player.py @@ -107,7 +107,7 @@ class SonosData: async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Sonos platform. Obsolete.""" _LOGGER.error( - "Loading Sonos by media_player platform config is no longer supported" + "Loading Sonos by media_player platform configuration is no longer supported" ) diff --git a/homeassistant/components/vizio/strings.json b/homeassistant/components/vizio/strings.json index 64b2fb5f936..5a554b7e3db 100644 --- a/homeassistant/components/vizio/strings.json +++ b/homeassistant/components/vizio/strings.json @@ -21,7 +21,7 @@ "abort": { "already_setup": "This entry has already been setup.", "already_setup_with_diff_host_and_name": "This entry appears to have already been setup with a different host and name based on its serial number. Please remove any old entries from your configuration.yaml and from the Integrations menu before reattempting to add this device.", - "updated_entry": "This entry has already been setup but the name and/or options defined in the config do not match the previously imported config so the config entry has been updated accordingly." + "updated_entry": "This entry has already been setup but the name and/or options defined in the configuration do not match the previously imported configuration, so the configuration entry has been updated accordingly." } }, "options": { diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py index 9b9236de1c2..ba7e26ee58c 100644 --- a/homeassistant/components/zwave/__init__.py +++ b/homeassistant/components/zwave/__init__.py @@ -678,7 +678,7 @@ async def async_setup_entry(hass, config_entry): if value.type == const.TYPE_BOOL: value.data = int(selection == "True") _LOGGER.info( - "Setting config parameter %s on Node %s with bool selection %s", + "Setting configuration parameter %s on Node %s with bool selection %s", param, node_id, str(selection), @@ -687,7 +687,7 @@ async def async_setup_entry(hass, config_entry): if value.type == const.TYPE_LIST: value.data = str(selection) _LOGGER.info( - "Setting config parameter %s on Node %s with list selection %s", + "Setting configuration parameter %s on Node %s with list selection %s", param, node_id, str(selection), @@ -697,7 +697,7 @@ async def async_setup_entry(hass, config_entry): network.manager.pressButton(value.value_id) network.manager.releaseButton(value.value_id) _LOGGER.info( - "Setting config parameter %s on Node %s " + "Setting configuration parameter %s on Node %s " "with button selection %s", param, node_id, @@ -706,7 +706,7 @@ async def async_setup_entry(hass, config_entry): return value.data = int(selection) _LOGGER.info( - "Setting config parameter %s on Node %s with selection %s", + "Setting configuration parameter %s on Node %s with selection %s", param, node_id, selection, @@ -714,7 +714,7 @@ async def async_setup_entry(hass, config_entry): return node.set_config_param(param, selection, size) _LOGGER.info( - "Setting unknown config parameter %s on Node %s with selection %s", + "Setting unknown configuration parameter %s on Node %s with selection %s", param, node_id, selection, diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py index d8e64172ba0..35631225bfb 100644 --- a/homeassistant/config_entries.py +++ b/homeassistant/config_entries.py @@ -183,7 +183,7 @@ class ConfigEntry: component = integration.get_component() except ImportError as err: _LOGGER.error( - "Error importing integration %s to set up %s config entry: %s", + "Error importing integration %s to set up %s configuration entry: %s", integration.domain, self.domain, err, @@ -197,7 +197,7 @@ class ConfigEntry: integration.get_platform("config_flow") except ImportError as err: _LOGGER.error( - "Error importing platform config_flow from integration %s to set up %s config entry: %s", + "Error importing platform config_flow from integration %s to set up %s configuration entry: %s", integration.domain, self.domain, err, @@ -503,7 +503,7 @@ class ConfigEntriesFlowManager(data_entry_flow.FlowManager): integration.get_platform("config_flow") except ImportError as err: _LOGGER.error( - "Error occurred loading config flow for integration %s: %s", + "Error occurred loading configuration flow for integration %s: %s", handler_key, err, ) @@ -1024,7 +1024,7 @@ class EntityRegistryDisabledHandler: self.changed = set() _LOGGER.info( - "Reloading config entries because disabled_by changed in entity registry: %s", + "Reloading configuration entries because disabled_by changed in entity registry: %s", ", ".join(self.changed), ) diff --git a/homeassistant/loader.py b/homeassistant/loader.py index 0f69f4600b2..9033202e652 100644 --- a/homeassistant/loader.py +++ b/homeassistant/loader.py @@ -541,7 +541,7 @@ def _async_mount_config_dir(hass: "HomeAssistant") -> bool: Async friendly but not a coroutine. """ if hass.config.config_dir is None: - _LOGGER.error("Can't load integrations - config dir is not set") + _LOGGER.error("Can't load integrations - configuration directory is not set") return False if hass.config.config_dir not in sys.path: sys.path.insert(0, hass.config.config_dir) diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py index 9d93e5e7042..82c0c0dbdbd 100644 --- a/tests/auth/test_init.py +++ b/tests/auth/test_init.py @@ -31,7 +31,7 @@ async def test_auth_manager_from_config_validates_config(mock_hass): [ {"name": "Test Name", "type": "insecure_example", "users": []}, { - "name": "Invalid config because no users", + "name": "Invalid configuration because no users", "type": "insecure_example", "id": "invalid_config", }, @@ -81,7 +81,7 @@ async def test_auth_manager_from_config_auth_modules(mock_hass): [ {"name": "Module 1", "type": "insecure_example", "data": []}, { - "name": "Invalid config because no data", + "name": "Invalid configuration because no data", "type": "insecure_example", "id": "another", },