jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add language to dark sky weather component" (#15142)

Browse Source 
* Revert "Fix #14919. Should throw exception when camera stream closed by frontend (#15028)"

This reverts commit 508d0459a7c188e87176e0ad57bed5d168e11050.

* Revert "Fix pylintrc section order and option placements (#15120)"

This reverts commit dbae410cf40f3a684ee5500b0691bed4c5c65204.

* Revert "Add storage helper and migrate config entries (#15045)"

This reverts commit ae51dc08bf5cb947d14b0e55fb64387b31924ac5.

* Revert "Add language to dark sky weather component (#15130)"

This reverts commit 672a3c7178afc91ac0da015f098dd5f96672e4f2.
This commit is contained in:
Pascal Vizeli 2018-06-25 19:04:07 +02:00 committed by GitHub
parent 508d0459a7
commit 42ba2a68ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
homeassistant/components/weather/darksky.py
View File

@ -25,22 +25,9 @@ _LOGGER = logging.getLogger(__name__)
ATTRIBUTION = "Powered by Dark Sky" ATTRIBUTION = "Powered by Dark Sky"
# Language Supported Codes
LANGUAGE_CODES = [
'ar', 'az', 'be', 'bg', 'bs', 'ca',
'cs', 'da', 'de', 'el', 'en', 'es',
'et', 'fi', 'fr', 'hr', 'hu', 'id',
'is', 'it', 'ja', 'ka', 'kw', 'nb',
'nl', 'pl', 'pt', 'ro', 'ru', 'sk',
'sl', 'sr', 'sv', 'tet', 'tr', 'uk',
'x-pig-latin', 'zh', 'zh-tw',
]
CONF_UNITS = 'units' CONF_UNITS = 'units'
CONF_LANGUAGE = 'language'
DEFAULT_NAME = 'Dark Sky' DEFAULT_NAME = 'Dark Sky'
DEFAULT_LANGUAGE = 'en'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_API_KEY): cv.string, vol.Required(CONF_API_KEY): cv.string,
@ -48,8 +35,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_LONGITUDE): cv.longitude, vol.Optional(CONF_LONGITUDE): cv.longitude,
vol.Optional(CONF_UNITS): vol.In(['auto', 'si', 'us', 'ca', 'uk', 'uk2']), vol.Optional(CONF_UNITS): vol.In(['auto', 'si', 'us', 'ca', 'uk', 'uk2']),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_LANGUAGE,
default=DEFAULT_LANGUAGE): vol.In(LANGUAGE_CODES),
}) })
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=3) MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=3)
@ -59,15 +44,15 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up the Dark Sky weather.""" """Set up the Dark Sky weather."""
latitude = config.get(CONF_LATITUDE, hass.config.latitude) latitude = config.get(CONF_LATITUDE, hass.config.latitude)
longitude = config.get(CONF_LONGITUDE, hass.config.longitude) longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
name = config[CONF_NAME] name = config.get(CONF_NAME)
lang = config[CONF_LANGUAGE]
api_key = config[CONF_API_KEY]
units = config.get(CONF_UNITS) units = config.get(CONF_UNITS)
if not units: if not units:
units = 'si' if hass.config.units.is_metric else 'us' units = 'si' if hass.config.units.is_metric else 'us'
dark_sky = DarkSkyData(api_key, latitude, longitude, units, lang) dark_sky = DarkSkyData(
config.get(CONF_API_KEY), latitude, longitude, units)
add_devices([DarkSkyWeather(name, dark_sky)], True) add_devices([DarkSkyWeather(name, dark_sky)], True)
@ -147,13 +132,12 @@ class DarkSkyWeather(WeatherEntity):
class DarkSkyData(object): class DarkSkyData(object):
"""Get the latest data from Dark Sky.""" """Get the latest data from Dark Sky."""
def __init__(self, api_key, latitude, longitude, units, lang): def __init__(self, api_key, latitude, longitude, units):
"""Initialize the data object.""" """Initialize the data object."""
self._api_key = api_key self._api_key = api_key
self.latitude = latitude self.latitude = latitude
self.longitude = longitude self.longitude = longitude
self.requested_units = units self.requested_units = units
self.language = lang
self.data = None self.data = None
self.currently = None self.currently = None
@ -168,7 +152,7 @@ class DarkSkyData(object):
try: try:
self.data = forecastio.load_forecast( self.data = forecastio.load_forecast(
self._api_key, self.latitude, self.longitude, self._api_key, self.latitude, self.longitude,
units=self.requested_units, lang=self.language) units=self.requested_units)
self.currently = self.data.currently() self.currently = self.data.currently()
self.hourly = self.data.hourly() self.hourly = self.data.hourly()
self.daily = self.data.daily() self.daily = self.data.daily()