From 0db8a41e56e2ebeea2cd6ea59b99ad579507e1ed Mon Sep 17 00:00:00 2001 From: domcross Date: Thu, 18 Mar 2021 20:58:48 +0100 Subject: [PATCH 1/4] localized weekday names in forecast gui --- __init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 23dc5b69..75cb1e64 100644 --- a/__init__.py +++ b/__init__.py @@ -17,6 +17,7 @@ import time from copy import deepcopy from datetime import datetime, timedelta +from lingua_franca.format import date_time_format from multi_key_dict import multi_key_dict from pyowm.webapi25.forecaster import Forecaster from pyowm.webapi25.forecastparser import ForecastParser @@ -369,14 +370,18 @@ def get_coming_days_forecast(self, forecast, unit, days=None): Returns: List of dicts containg weather info """ days = days or 4 - weekdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] + result_temp_day = nice_date(datetime.now()) # forces lingua_franca to initialize + if self.lang in date_time_format.lang_config.keys(): + weekdays = list(date_time_format.lang_config[self.lang]['weekday'].values()) + else: + weekdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] forecast_list = [] # Get tomorrow and 4 days forward for weather in list(forecast.get_weathers())[1:5]: result_temp = weather.get_temperature(unit) day_num = datetime.weekday( datetime.fromtimestamp(weather.get_reference_time())) - result_temp_day = weekdays[day_num] + result_temp_day = weekdays[day_num][:3] forecast_list.append({ "weathercode": self.CODES[weather.get_weather_icon_name()], "max": round(result_temp['max']), From 8b5153193b54a8a255216c01cf6c8fd91e1d892b Mon Sep 17 00:00:00 2001 From: domcross Date: Fri, 19 Mar 2021 09:16:44 +0100 Subject: [PATCH 2/4] localized weekday names in forecast-gui --- __init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/__init__.py b/__init__.py index 75cb1e64..2eb300a2 100644 --- a/__init__.py +++ b/__init__.py @@ -17,7 +17,6 @@ import time from copy import deepcopy from datetime import datetime, timedelta -from lingua_franca.format import date_time_format from multi_key_dict import multi_key_dict from pyowm.webapi25.forecaster import Forecaster from pyowm.webapi25.forecastparser import ForecastParser @@ -31,7 +30,7 @@ from mycroft.messagebus.message import Message from mycroft.util.log import LOG from mycroft.util.format import (nice_date, nice_time, nice_number, - pronounce_number, join_list) + pronounce_number, join_list, date_time_format) from mycroft.util.parse import extract_datetime, extract_number from mycroft.util.time import now_local, to_utc, to_local @@ -370,7 +369,7 @@ def get_coming_days_forecast(self, forecast, unit, days=None): Returns: List of dicts containg weather info """ days = days or 4 - result_temp_day = nice_date(datetime.now()) # forces lingua_franca to initialize + result_temp_day = nice_date(datetime.now()) # forces date_time_format to initialize if self.lang in date_time_format.lang_config.keys(): weekdays = list(date_time_format.lang_config[self.lang]['weekday'].values()) else: From efd4c799fa6703a09ab88d0dc1f51d0ecd40baae Mon Sep 17 00:00:00 2001 From: domcross Date: Fri, 19 Mar 2021 09:44:10 +0100 Subject: [PATCH 3/4] use localized format for idle-screen/gui --- __init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 2eb300a2..03d9f040 100644 --- a/__init__.py +++ b/__init__.py @@ -308,7 +308,7 @@ def initialize(self): except Exception as e: self.log.warning('Could not prepare forecasts. ' '({})'.format(repr(e))) - + _ = nice_date(datetime.now()) # init date_time_format/lingua_franca # self.test_screen() # DEBUG: Used during screen testing/debugging def test_screen(self): @@ -369,7 +369,6 @@ def get_coming_days_forecast(self, forecast, unit, days=None): Returns: List of dicts containg weather info """ days = days or 4 - result_temp_day = nice_date(datetime.now()) # forces date_time_format to initialize if self.lang in date_time_format.lang_config.keys(): weekdays = list(date_time_format.lang_config[self.lang]['weekday'].values()) else: From 36271137b858d26c1113ef2135a3b23a71761ebd Mon Sep 17 00:00:00 2001 From: domcross Date: Fri, 19 Mar 2021 15:42:53 +0100 Subject: [PATCH 4/4] localized weekday names for forecast/gui --- __init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index 03d9f040..84a357ed 100644 --- a/__init__.py +++ b/__init__.py @@ -308,7 +308,9 @@ def initialize(self): except Exception as e: self.log.warning('Could not prepare forecasts. ' '({})'.format(repr(e))) - _ = nice_date(datetime.now()) # init date_time_format/lingua_franca + + date_time_format.cache(self.lang) + # self.test_screen() # DEBUG: Used during screen testing/debugging def test_screen(self):