Skip to content

Commit 6f485ee

Browse files
wangjiewangjie
authored andcommitted
架构调整
1 parent 84dc6e1 commit 6f485ee

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

src/i18n.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,69 +205,79 @@ impl Texts {
205205
}
206206
}
207207

208+
#[cfg(target_os = "macos")]
208209
pub const fn settings_informative_text(&self) -> &'static str {
209210
match self.lang {
210211
Language::En => "After saving, the timer will restart from now.",
211212
Language::Zh => "保存后将从现在开始重新计时。",
212213
}
213214
}
214215

216+
#[cfg(target_os = "macos")]
215217
pub const fn settings_save_button(&self) -> &'static str {
216218
match self.lang {
217219
Language::En => "Save",
218220
Language::Zh => "保存",
219221
}
220222
}
221223

224+
#[cfg(target_os = "macos")]
222225
pub const fn settings_cancel_button(&self) -> &'static str {
223226
match self.lang {
224227
Language::En => "Cancel",
225228
Language::Zh => "取消",
226229
}
227230
}
228231

232+
#[cfg(target_os = "macos")]
229233
pub const fn settings_language_button(&self) -> &'static str {
230234
match self.lang {
231235
Language::En => "Language…",
232236
Language::Zh => "语言…",
233237
}
234238
}
235239

240+
#[cfg(target_os = "macos")]
236241
pub const fn settings_interval_label(&self) -> &'static str {
237242
match self.lang {
238243
Language::En => "Break every N minutes:",
239244
Language::Zh => "每 N 分钟休息:",
240245
}
241246
}
242247

248+
#[cfg(target_os = "macos")]
243249
pub const fn settings_break_label(&self) -> &'static str {
244250
match self.lang {
245251
Language::En => "Rest for N seconds:",
246252
Language::Zh => "休息 N 秒:",
247253
}
248254
}
249255

256+
#[cfg(target_os = "macos")]
250257
pub const fn choose_language_message(&self) -> &'static str {
251258
match self.lang {
252259
Language::En => "Choose your preferred language.",
253260
Language::Zh => "选择界面语言。",
254261
}
255262
}
256263

264+
#[cfg(target_os = "macos")]
257265
pub const fn choose_language_note(&self) -> &'static str {
258266
match self.lang {
259267
Language::En => "Auto follows your system language.",
260268
Language::Zh => "“自动”将跟随系统语言。",
261269
}
262270
}
263271

272+
#[cfg(target_os = "macos")]
264273
pub const fn ok_button(&self) -> &'static str {
265274
match self.lang {
266275
Language::En => "OK",
267276
Language::Zh => "好",
268277
}
269278
}
270279

280+
#[cfg(target_os = "macos")]
271281
pub const fn visit_homepage_button(&self) -> &'static str {
272282
match self.lang {
273283
Language::En => "Visit homepage",
@@ -310,8 +320,7 @@ impl Texts {
310320
"Current settings:\n\nBreak every {interval_minutes} minutes for {break_seconds} seconds.\n\nAfter saving, the timer will restart from now.\n\nReset to defaults (30 min / 120 sec)?"
311321
),
312322
Language::Zh => format!(
313-
"当前配置:\n\n每 {} 分钟休息 {} 秒\n\n保存后将从现在开始重新计时。\n\n是否使用默认配置(30分钟/120秒)?",
314-
interval_minutes, break_seconds
323+
"当前配置:\n\n每 {interval_minutes} 分钟休息 {break_seconds} 秒\n\n保存后将从现在开始重新计时。\n\n是否使用默认配置(30分钟/120秒)?"
315324
),
316325
}
317326
}
@@ -346,6 +355,7 @@ pub fn detect_system_language() -> Language {
346355
}
347356
}
348357

358+
#[cfg(not(target_os = "windows"))]
349359
pub fn detect_system_language_env() -> Language {
350360
for key in ["LC_ALL", "LC_MESSAGES", "LANG"] {
351361
if let Some(v) = std::env::var_os(key) {
@@ -357,6 +367,7 @@ pub fn detect_system_language_env() -> Language {
357367
Language::En
358368
}
359369

370+
#[cfg(not(target_os = "windows"))]
360371
pub fn language_from_tag(tag: &str) -> Option<Language> {
361372
let s = tag.trim();
362373
if s.is_empty() {

src/windows/ui/tray.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use super::super::utils::{approx_duration, format_hhmm, to_wide_array, to_wide_s
2424
use crate::i18n::{LanguagePreference, Texts};
2525

2626
/// 设置系统托盘图标
27+
#[allow(clippy::too_many_lines)]
2728
pub fn setup_tray_icon(hwnd: HWND) {
2829
let config = with_state_ref(|s| s.config.clone());
2930
let texts = Texts::new(config.effective_language());

0 commit comments

Comments
 (0)