diff --git a/README.rst b/README.rst index 5cea28f5dca..b63377dbaf0 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/home-assistant/home-assistant| |Join the dev chat at https://gitter.im/home-assistant/home-assistant/devs| -================================================================================================================== +============================================================================================================================================================================================== Home Assistant is a home automation platform running on Python 3. The goal of Home Assistant is to be able to track and control all devices at diff --git a/homeassistant/components/sensor/fitbit.py b/homeassistant/components/sensor/fitbit.py index f928b9a78e9..7d122f857d7 100644 --- a/homeassistant/components/sensor/fitbit.py +++ b/homeassistant/components/sensor/fitbit.py @@ -85,15 +85,15 @@ FITBIT_MEASUREMENTS = { "liquids": "fl. oz.", "blood glucose": "mg/dL", }, - "en_UK": { + "en_GB": { "duration": "milliseconds", "distance": "kilometers", "elevation": "meters", "height": "centimeters", "weight": "stone", "body": "centimeters", - "liquids": "millileters", - "blood glucose": "mmol/l" + "liquids": "milliliters", + "blood glucose": "mmol/L" }, "metric": { "duration": "milliseconds", @@ -102,8 +102,8 @@ FITBIT_MEASUREMENTS = { "height": "centimeters", "weight": "kilograms", "body": "centimeters", - "liquids": "millileters", - "blood glucose": "mmol/l" + "liquids": "milliliters", + "blood glucose": "mmol/L" } } @@ -153,7 +153,8 @@ def request_app_setup(hass, config, add_devices, config_path, else: setup_platform(hass, config, add_devices, discovery_info) - start_url = "{}{}".format(hass.config.api.base_url, FITBIT_AUTH_START) + start_url = "{}{}".format(hass.config.api.base_url, + FITBIT_AUTH_CALLBACK_PATH) description = """Please create a Fitbit developer app at https://dev.fitbit.com/apps/new. @@ -222,8 +223,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None): access_token = config_file.get("access_token") refresh_token = config_file.get("refresh_token") if None not in (access_token, refresh_token): - authd_client = fitbit.Fitbit(config.get("client_id"), - config.get("client_secret"), + authd_client = fitbit.Fitbit(config_file.get("client_id"), + config_file.get("client_secret"), access_token=access_token, refresh_token=refresh_token) @@ -239,8 +240,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None): add_devices(dev) else: - oauth = fitbit.api.FitbitOauth2Client(config.get("client_id"), - config.get("client_secret")) + oauth = fitbit.api.FitbitOauth2Client(config_file.get("client_id"), + config_file.get("client_secret")) redirect_uri = "{}{}".format(hass.config.api.base_url, FITBIT_AUTH_CALLBACK_PATH) @@ -301,9 +302,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None): setup_platform(hass, config, add_devices, discovery_info=None) - hass.http.register_path("GET", FITBIT_AUTH_START, _start_fitbit_auth) + hass.http.register_path("GET", FITBIT_AUTH_START, _start_fitbit_auth, + require_auth=False) hass.http.register_path("GET", FITBIT_AUTH_CALLBACK_PATH, - _finish_fitbit_auth) + _finish_fitbit_auth, require_auth=False) request_oauth_completion(hass) diff --git a/homeassistant/const.py b/homeassistant/const.py index de7200bd9be..1808ffbada1 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -1,7 +1,7 @@ # coding: utf-8 """Constants used by Home Assistant components.""" -__version__ = "0.19.2" +__version__ = "0.19.3" REQUIRED_PYTHON_VER = (3, 4) PLATFORM_FORMAT = '{}.{}'