leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(time): use static global strings for settings titles

Browse source
This commit is contained in:
maciekk64 2024-03-26 18:04:29 +01:00 • committed by Michael Murphy
parent b5e1e6d677
commit 11978dff82
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cosmic-settings/src/pages/time/date.rs
View file

@ -14,6 +14,12 @@ use cosmic_settings_page::{self as page, section};
use slotmap::SlotMap; use slotmap::SlotMap;
use tracing::error; use tracing::error;
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");
}
pub struct Page { pub struct Page {
config: cosmic_config::Config, config: cosmic_config::Config,
auto: bool, auto: bool,
@ -133,20 +139,20 @@ fn format() -> Section<crate::pages::Message> {
Section::default() Section::default()
.title(fl!("time-format")) .title(fl!("time-format"))
.descriptions(vec![ .descriptions(vec![
fl!("time-format", "twenty-four").into(), TIME_FORMAT_TWENTY_FOUR.as_str().into(),
fl!("time-format", "first").into(), TIME_FORMAT_FIRST.as_str().into(),
fl!("time-format", "show-date").into(), TIME_FORMAT_SHOW_DATE.as_str().into(),
]) ])
.view::<Page>(|_binder, page, section| { .view::<Page>(|_binder, page, section| {
settings::view_section(&section.title) settings::view_section(&section.title)
// 24-hour toggle // 24-hour toggle
.add( .add(
settings::item::builder(&*section.descriptions[0]) settings::item::builder(&*TIME_FORMAT_TWENTY_FOUR)
.toggler(page.military_time, Message::MilitaryTime), .toggler(page.military_time, Message::MilitaryTime),
) )
// First day of week // First day of week
.add( .add(
settings::item::builder(&*section.descriptions[1]).control(dropdown( settings::item::builder(&*TIME_FORMAT_FIRST).control(dropdown(
&["Friday", "Saturday", "Sunday", "Monday"], &["Friday", "Saturday", "Sunday", "Monday"],
match page.first_day_of_week { match page.first_day_of_week {
4 => Some(0), // friday 4 => Some(0), // friday
@ -166,7 +172,7 @@ fn format() -> Section<crate::pages::Message> {
) )
// Date on top panel toggle // Date on top panel toggle
.add( .add(
settings::item::builder(&*section.descriptions[2]) settings::item::builder(&*TIME_FORMAT_SHOW_DATE)
.toggler(page.show_date_in_top_panel, Message::ShowDate), .toggler(page.show_date_in_top_panel, Message::ShowDate),
) )
.apply(cosmic::Element::from) .apply(cosmic::Element::from)