From 8f2d51c98b6033307e72093c3be84c3b687ae9b5 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Tue, 23 Apr 2024 15:07:09 +0800 Subject: [PATCH] fix(greeter & locker): Display date below time in English environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 英文环境下下方显示日期时间加入日期显示 Closes #35552 --- lib/login-frame/login-frame.cpp | 4 +- translations/lightdm-kiran-greeter.zh_CN.ts | 116 ++++++++++++++------ 2 files changed, 85 insertions(+), 35 deletions(-) diff --git a/lib/login-frame/login-frame.cpp b/lib/login-frame/login-frame.cpp index 67e54e5..cbd61d3 100644 --- a/lib/login-frame/login-frame.cpp +++ b/lib/login-frame/login-frame.cpp @@ -244,7 +244,7 @@ QString LoginFrame::getCurrentDateTime() { QDateTime dateTime = QDateTime::currentDateTime(); // tr : MM月MM日 dddd HH:mm - QString res = dateTime.toString(tr("dddd MMM HH:mm")); + QString res = dateTime.toString(tr("ddd MMM dd HH:mm")); return res; } @@ -360,4 +360,4 @@ void LoginFrame::onAuthTypeChanged(KADAuthType type) } } // namespace SessionGuard -} // namespace Kiran \ No newline at end of file +} // namespace Kiran diff --git a/translations/lightdm-kiran-greeter.zh_CN.ts b/translations/lightdm-kiran-greeter.zh_CN.ts index 45ba866..a22b407 100644 --- a/translations/lightdm-kiran-greeter.zh_CN.ts +++ b/translations/lightdm-kiran-greeter.zh_CN.ts @@ -47,19 +47,60 @@ 返回 + + GreeterSubItem + + + Greeter Settings + 登录选项 + + Kiran::SessionGuard::AuthController - + Failed to authenticate 认证失败 + + Kiran::SessionGuard::AuthTypeSwitcher + + + face auth + 人脸认证 + + + + finger auth + 指纹认证 + + + + password auth + 密码认证 + + + + finger vein auth + 指静脉认证 + + + + iris auth + 虹膜认证 + + + + ukey auth + UKey认证 + + Kiran::SessionGuard::Greeter::Frame - + login other user 登录其他用户 @@ -99,8 +140,8 @@ 虚拟键盘 - - + + return 返回 @@ -108,7 +149,7 @@ Kiran::SessionGuard::Greeter::LoginButton - + login 登录 @@ -116,105 +157,110 @@ Kiran::SessionGuard::Greeter::SettingWindow - + general settings - + autologin - + auto login user(take effect after restart) - + auto login delay(seconds)(take effect after restart) - - + + Save - - + + Reset - + + login background setting + + + + Scale Mode - + auto - + manual - + disable - + Scale Factor - + Enable manual input user login - + Show User List - - + + Configuration changed - - + + The external configuration file has changed If you choose to save, all external changes will be overwritten Select discard to discard the modification and reload the new configuration - - + + Save failed, reload - - + + Saved successfully - + Save failed: %1 - + Please ensure that one of the two options is turned on! @@ -222,15 +268,19 @@ Select discard to discard the modification and reload the new configuration Kiran::SessionGuard::LoginFrame - + Entry your name 请输入用户名 - - dddd MMM HH:mm + + ddd MMM dd HH:mm MM月dd日 dddd HH:mm + + dddd MMM HH:mm + MM月dd日 dddd HH:mm + LoginButton -- 2.33.0