Add English translation (fix #23)

Author: mskrasnov

Cargo.toml

@@ -24,12 +24,16 @@ opt-level = "s"
 anyhow = "1.0.97"
 chrono = "0.4.40"
 home = "0.5.11"
+i18n-embed = { version = "0.15.3", features = ["fluent-system", "desktop-requester"] }
+i18n-embed-fl = "0.9.3"
 iced = { version = "0.13.1", default-features = false, features = [
     "tiny-skia",
     "image",
     "tokio",
     "advanced",
 ] }
+lazy_static = "1.5.0"
+rust-embed = "8.7.0"
 serde = { version = "1.0.219", features = ["derive"] }
 tokio = { version = "1.44.1", features = ["full"] }
 toml = "0.8.20"

README.md

@@ -13,9 +13,9 @@
     </h4>
 </div>
 
-> **Warning:** now TimeKeeper only in Russian. I will add new translations (English for example) to version 1.0.0.
+> **Note 0:** now TimeKeeper have English and Russian translations.
 >
-> **Note:** the Windows build of program hasn't been signed yet and I don't think I will ever sign it. I don't have time for this now, so deal with the program signature yourself.
+> **Note 1:** the Windows build of program hasn't been signed yet and I don't think I will ever sign it. I don't have time for this now, so deal with the program signature yourself.
 
 ## What is TimeKeeper?
 

i18n.toml

@@ -0,0 +1,4 @@
+fallback_language = "en"
+
+[fluent]
+assets_dir = "i18n"

i18n/en/time_keeper.ftl

@@ -0,0 +1,68 @@
+# TimeKeeper English translation
+# (C) 2025 Michail Krasnov <michail383krasnov@mail.ru>
+
+work_notification = Yay! I have to work again!
+break_notification = It's time to take a break
+
+#############
+# MAIN PAGE #
+#############
+
+# Labels
+work = Work
+break = Break
+
+# Control buttons
+start = Start
+pause = Pause
+stop = Stop
+
+# Statistics subpage
+stats_date = Date:
+stats_type = Type:
+stats_duration = Duration:
+empty_stats = Statistics are empty
+ten_cycles = The last 10 cycles are shown
+
+# Footer buttons
+preferences = Preferences
+about = About
+show-stats = Show stats
+hide-stats = Hide stats
+
+
+##############
+# ABOUT PAGE #
+##############
+
+about_version = Version
+about_idea = Idea and realization
+about_other = Other members
+about_internet = TimeKeeper online
+about_site = Site
+about_repo = Repository
+
+about_id1 = {$name}: design; project text
+about_id2 = {$name}: testing; project text
+
+
+####################
+# PREFERENCES PAGE #
+####################
+
+pref_header = Preferences
+
+pref_break_alerts = Break alerts
+pref_notifications = Notifications
+pref_save = Save
+pref_close = Close
+
+pref_notifications_tooltip = If the checkbox is selected, TimeKeeper will send notifications to the desktop. If the checkbox is unchecked, a modal window with a countdown to continue work will open on top of all windows instead of notifications
+pref_work_slider_tooltip =
+    The change step is 10 minutes. Press Shift
+    to change the time in minute increments
+pref_work_change = Time changes from 30 minutes to 3 hours
+pref_break_slider_tooltip =
+    Time change by the minute. Press Shift to
+    set the time in 10-minute increments
+pref_break_change = Time changes from 1 to 30 minutes

i18n/ru/time_keeper.ftl

@@ -0,0 +1,67 @@
+# TimeKeeper English translation
+# (C) 2025 Michail Krasnov <michail383krasnov@mail.ru>
+
+work_notification = Ура! Мне сново надо работать!
+break_notification = Пришла пора немного передохнУть. Или передОхнуть.
+
+#############
+# MAIN PAGE #
+#############
+
+# Labels
+work = Работа
+break = Перерыв
+
+# Control buttons
+start = Старт
+pause = Пауза
+stop = Стоп
+
+# Statistics subpage
+stats_date = Дата:
+stats_type = Тип:
+stats_duration = Длит.:
+empty_stats = Статистика пуста...
+ten_cycles = Показываются последние 10 циклов
+
+# Footer buttons
+preferences = Настройки
+about = О программе
+show-stats = Показать статистику
+hide-stats = Скрыть статистику
+
+
+##############
+# ABOUT PAGE #
+##############
+
+about_version = Версия
+about_idea = Идея и реализация
+about_other = Другие участники
+about_internet = TimeKeeper в интернете
+about_site = Сайт
+about_repo = Репозиторий
+
+about_id1 = {$name}: дизайн; текст проекта
+about_id2 = {$name}: тестирование; текст проекта
+
+
+####################
+# PREFERENCES PAGE #
+####################
+
+pref_header = Настройки
+
+pref_break_alerts = Оповещ. о перерыве
+pref_notifications = Уведомления
+pref_save = Сохранить
+pref_close = Закрыть
+pref_notifications_tooltip = Если установлен флажок, то TimeKeeper будет отсылать уведомления на рабочий стол. Если флажок не стоит, то вместо уведомлений поверх всех окон будет открываться модальное окно с обратным отсчётом времени до продолжения работы
+pref_work_slider_tooltip =
+    Шаг изменения - 10 минут. Зажмите
+    Shift, чтобы изменять время поминутно
+pref_work_change = Время изменяется от 30 минут до 3 часов
+pref_break_slider_tooltip =
+    Изменение времени поминутно. Зажмите
+    Shift, чтобы установить шаг в 10 минут
+pref_break_change = Время изменяется от 1 до 30 минут

src/i18n.rs

@@ -0,0 +1,35 @@
+//! Internationalization support
+
+use i18n_embed::{
+    DesktopLanguageRequester,
+    fluent::{FluentLanguageLoader, fluent_language_loader},
+};
+use lazy_static::lazy_static;
+use rust_embed::RustEmbed;
+
+#[derive(RustEmbed)]
+#[folder = "./i18n"]
+struct Locales;
+
+fn read() -> FluentLanguageLoader {
+    let ldr: FluentLanguageLoader = fluent_language_loader!();
+    let req_langs = DesktopLanguageRequester::requested_languages();
+    i18n_embed::select(&ldr, &Locales, &req_langs).unwrap();
+
+    ldr
+}
+
+lazy_static! {
+    pub static ref LANG_LDR: FluentLanguageLoader = read();
+}
+
+#[macro_export]
+macro_rules! fl {
+    ($message_id:literal) => {{
+        i18n_embed_fl::fl!($crate::i18n::LANG_LDR, $message_id)
+    }};
+
+    ($message_id:literal, $($args:expr),*) => {{
+        i18n_embed_fl::fl!($crate::i18n::LANG_LDR, $message_id, $($args), *)
+    }}
+}

src/main.rs

@@ -14,6 +14,7 @@
 mod conf;
 mod consts;
 mod external_cmd;
+mod i18n;
 mod pathes;
 mod stats;
 mod time;

src/ui/notify.rs

@@ -14,7 +14,7 @@ use winrt_notification::{Duration, Sound, Toast};
 #[cfg(unix)]
 use notify_rust::Notification;
 
-use crate::consts::PROG_NAME;
+use crate::{consts::PROG_NAME, fl};
 
 struct Notify {
     title: String,
@@ -66,8 +66,8 @@ impl Notify {
 
 pub fn notify_send(is_work: bool) {
     let n_text = match is_work {
-        false => "Ура! Мне сново надо работать!",
-        true => "Пришла пора немного передохнУть. Или передОхнуть.",
+        false => fl!("work_notification"),
+        true => fl!("break_notification"),
     };
     let _ = Notify::new(PROG_NAME, n_text).show();
 }

src/ui/view/about.rs

@@ -4,6 +4,7 @@ use crate::{
     consts::{
         PROG_CRATES_URL, PROG_LOGO, PROG_NAME, PROG_REPO, PROG_SITE, PROG_TELEGRAM, PROG_VER,
     },
+    fl,
     ui::{
         Message, TimeKeeper,
         widget::{header, url_button},
@@ -31,28 +32,28 @@ impl TimeKeeper {
     pub fn about_page(&self) -> Element<Message> {
         let about_devs = column![
             column![
-                row![text("Идея и реализация"), horizontal_rule(0)]
+                row![text(fl!("about_idea")), horizontal_rule(0)]
                     .spacing(5)
                     .align_y(Center),
                 text("Михаил Краснов <https://github.com/mskrasnov>").size(SMALL_TEXT_SIZE),
             ]
             .spacing(3),
             column![
-                row![text("Другие участники"), horizontal_rule(0)]
+                row![text(fl!("about_other")), horizontal_rule(0)]
                     .spacing(5)
                     .align_y(Center),
-                text("Данила Макаров: дизайн, текст проекта").size(SMALL_TEXT_SIZE),
-                text("Максим Марушин: тестирование, текст проекта").size(SMALL_TEXT_SIZE),
+                text(fl!("about_id1", name = "Данила Макаров")).size(SMALL_TEXT_SIZE),
+                text(fl!("about_id2", name = "Максим Марушин")).size(SMALL_TEXT_SIZE),
             ]
             .spacing(3),
             column![
-                row![text("TimeKeeper в интернете"), horizontal_rule(0)]
+                row![text(fl!("about_internet")), horizontal_rule(0)]
                     .spacing(5)
                     .align_y(Center),
                 row![
-                    url_button("Сайт", PROG_SITE).on_press(Message::OpenSiteUrl),
+                    url_button(fl!("about_site"), PROG_SITE).on_press(Message::OpenSiteUrl),
                     text("|").size(SMALL_TEXT_SIZE),
-                    url_button("Репозиторий", PROG_REPO).on_press(Message::OpenRepoUrl),
+                    url_button(fl!("about_repo"), PROG_REPO).on_press(Message::OpenRepoUrl),
                     text("|").size(SMALL_TEXT_SIZE),
                     url_button("crates.io", PROG_CRATES_URL).on_press(Message::OpenCratesUrl),
                     text("|").size(SMALL_TEXT_SIZE),
@@ -85,7 +86,8 @@ impl TimeKeeper {
 
     fn get_header(&self) -> Column<Message> {
         let mut version = String::with_capacity(10);
-        version.push_str("Версия ");
+        version.push_str(fl!("about_version").as_str());
+        version.push(' ');
         version.push_str(PROG_VER);
 
         column![header(PROG_NAME).size(20), text(version).size(15),].spacing(5)