fix: Time text changes with time zone (#386)

as title Log: Time text changes with time zone Bug: https://pms.uniontech.com/bug-view-287217.html
linuxdeepin · Nov 27, 2024 · 7ff64c2 · 7ff64c2
1 parent 510ab68
commit 7ff64c2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/widgets/timewidget.cpp b/src/widgets/timewidget.cpp
@@ -63,7 +63,8 @@ void TimeWidget::set24HourFormat(bool use24HourFormat)
 
 void TimeWidget::updateLocale(const QString &locale, const QString &shortTimeFormat, const QString &longDateFormat)
 {
-    m_locale = locale.isEmpty() ? QLocale::system() : QLocale(locale);
+    Q_UNUSED(locale);
+    m_locale = QLocale::system(); // locale.isEmpty() ? QLocale::system() : QLocale(locale);
     if (!shortTimeFormat.isEmpty())
         m_shortTimeFormat = shortTimeFormat;
     if (!longDateFormat.isEmpty())
@@ -79,6 +80,9 @@ void TimeWidget::refreshTime()
         m_timeLabel->setText(m_locale.toString(QDateTime::currentDateTime(), shortTimeFormat.at(m_shortTimeIndex) + " AP"));
     }
 
+    // "Ap"/"aP"->"AP"
+    m_shortTimeFormat.replace(QRegExp("a?p", Qt::CaseInsensitive), "AP");
+
     QString date_format = shortDateFormat.at(m_shortDateIndex) + " " + weekdayFormat.at(m_weekdayIndex);
     m_dateLabel->setText(m_locale.toString(QDateTime::currentDateTime(), date_format));