zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00
Code Activity

feat(clock): localization support

Browse source
This commit is contained in:
Jake Stanger 2023-07-03 23:20:37 +01:00
parent 7c8d4668bc
commit b310ea7636
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
4 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/clock.rs
View file

@ -3,12 +3,13 @@ use crate::gtk_helpers::add_class;
use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
use crate::popup::Popup;
use crate::{send_async, try_send};
use chrono::{DateTime, Local};
use chrono::{DateTime, Local, Locale};
use color_eyre::Result;
use glib::Continue;
use gtk::prelude::*;
use gtk::{Align, Button, Calendar, Label, Orientation};
use serde::Deserialize;
use std::env;
use tokio::spawn;
use tokio::sync::mpsc;
use tokio::time::sleep;
@ -26,6 +27,9 @@ pub struct ClockModule {
#[serde(default = "default_popup_format")]
format_popup: String,
#[serde(default = "default_locale")]
locale: String,
#[serde(flatten)]
pub common: Option<CommonConfig>,
}
@ -38,6 +42,20 @@ fn default_popup_format() -> String {
String::from("%H:%M:%S")
}
fn default_locale() -> String {
env::var("LC_TIME")
.or_else(|_| env::var("LANG"))
.map(strip_tail)
.unwrap_or_else(|_| "POSIX".to_string())
}
fn strip_tail(string: String) -> String {
string
.split_once('.')
.map(|(head, _)| head.to_string())
.unwrap_or(string)
}
impl Module<Button> for ClockModule {
type SendMessage = DateTime<Local>;
type ReceiveMessage = ();
@ -82,9 +100,10 @@ impl Module<Button> for ClockModule {
});
let format = self.format.clone();
let locale = Locale::try_from(self.locale.as_str()).unwrap_or(Locale::POSIX);
context.widget_rx.attach(None, move |date| {
let date_string = format!("{}", date.format(&format));
let date_string = format!("{}", date.format_localized(&format, locale));
label.set_label(&date_string);
Continue(true)
});
@ -115,8 +134,10 @@ impl Module<Button> for ClockModule {
container.add(&calendar);
let format = self.format_popup;
let locale = Locale::try_from(self.locale.as_str()).unwrap_or(Locale::POSIX);
rx.attach(None, move |date| {
let date_string = format!("{}", date.format(&format));
let date_string = format!("{}", date.format_localized(&format, locale));
clock.set_label(&date_string);
Continue(true)
});