Add meridiem to translations

Solves #1359
This commit is contained in:
Edward Firmo
2023-12-19 16:19:37 +01:00
parent a7c5533121
commit 482fe16e75
2 changed files with 98 additions and 4 deletions

View File

@@ -489,6 +489,7 @@ api:
date_color: int
time_format: string
time_color: int
meridiem: string[]
chip_font_size: int
notification_icon: string
notification_icon_color_normal: int[]
@@ -506,6 +507,7 @@ api:
// Localization
ESP_LOGV(TAG, "Load localization");
id(mui_time_format) = time_format;
id(mui_meridiem) = meridiem;
// Date/Time colors
ESP_LOGV(TAG, "Load date/time colors");
@@ -795,6 +797,10 @@ globals:
type: uint
restore_value: true
initial_value: '65535'
- id: mui_meridiem
type: std::vector<std::string>
restore_value: false
initial_value: '{"AM", "PM"}'
##### Chips #####
- id: home_chip_font_size
@@ -2218,7 +2224,7 @@ script:
std::string time_format_str = id(mui_time_format);
if (time_format_str.find("%p") != std::string::npos)
{
std::string meridiem_text = id(time_provider).now().strftime("%p");
std::string meridiem_text = (id(time_provider).now().hour<12) ? id(mui_meridiem)[0] : id(mui_meridiem)[1];
disp1->set_component_text_printf("home.meridiem", "%s", meridiem_text.c_str());
}
else { disp1->set_component_text_printf("home.meridiem", " "); }