From 9a734a81f895c74c52ee891d0218180680df0017 Mon Sep 17 00:00:00 2001 From: maciekk64 Date: Tue, 26 Mar 2024 19:03:11 +0100 Subject: [PATCH] fix(time): make weekdays translatable --- cosmic-settings/src/pages/time/date.rs | 3 ++- i18n/en/cosmic_settings.ftl | 4 ++++ i18n/pl/cosmic_settings.ftl | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 6926b74..872286a 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -18,6 +18,7 @@ crate::cache_dynamic_lazy! { static TIME_FORMAT_TWENTY_FOUR: String = fl!("time-format", "twenty-four"); static TIME_FORMAT_FIRST: String = fl!("time-format", "first"); static TIME_FORMAT_SHOW_DATE: String = fl!("time-format", "show-date"); + static TIME_FORMAT_WEEKDAYS: [String; 4] = [fl!("time-format", "friday"), fl!("time-format", "saturday"), fl!("time-format", "sunday"), fl!("time-format", "monday")]; } pub struct Page { @@ -153,7 +154,7 @@ fn format() -> Section { // First day of week .add( settings::item::builder(&*TIME_FORMAT_FIRST).control(dropdown( - &["Friday", "Saturday", "Sunday", "Monday"], + &*TIME_FORMAT_WEEKDAYS, match page.first_day_of_week { 4 => Some(0), // friday 5 => Some(1), // saturday diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index 5dd5753..456df78 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -294,6 +294,10 @@ time-format = Date & Time Format .twenty-four = 24-hour time .first = First day of week .show-date = Show Date on Top Panel + .friday = Friday + .saturday = Saturday + .sunday = Sunday + .monday = Monday time-region = Region & Language .desc = Format dates, times, and numbers based on your region diff --git a/i18n/pl/cosmic_settings.ftl b/i18n/pl/cosmic_settings.ftl index 3898ecb..13d705e 100644 --- a/i18n/pl/cosmic_settings.ftl +++ b/i18n/pl/cosmic_settings.ftl @@ -299,6 +299,10 @@ time-format = Format Daty i Czasu .twenty-four = Czas 24-godzinny .first = Pierwszy dzień tygodnia .show-date = Pokaż Datę w Górnym Panelu + .friday = Piątek + .saturday = Sobota + .sunday = Niedziela + .monday = Poniedziałek time-region = Region i Język .desc = Format dat, czasu i numerów na podstawie wybranego regionu