diff --git a/src/session-widgets/lockcontent.cpp b/src/session-widgets/lockcontent.cpp index 6a2367ae..1dc92528 100644 --- a/src/session-widgets/lockcontent.cpp +++ b/src/session-widgets/lockcontent.cpp @@ -78,6 +78,9 @@ LockContent::LockContent(SessionBaseModel *const model, QWidget *parent) } } once = true; + + QString localeName = regionValue(localeName_key); + m_timeWidget->updateLocale(QLocale(localeName)); } void LockContent::initUI() @@ -294,7 +297,7 @@ void LockContent::onCurrentUserChanged(std::shared_ptr user) m_user = user; m_localeName = regionValue(localeName_key); - QLocale locale = m_localeName.isEmpty()? QLocale::system() : QLocale(m_localeName); + QLocale locale = m_localeName.isEmpty()? user->locale() : QLocale(m_localeName); m_shortTimeFormat = regionValue(shortTimeFormat_key); m_longDateFormat = regionValue(longDateFormat_key); buildConnect(); diff --git a/src/widgets/timewidget.cpp b/src/widgets/timewidget.cpp index 1e81914c..657c89c9 100644 --- a/src/widgets/timewidget.cpp +++ b/src/widgets/timewidget.cpp @@ -63,7 +63,7 @@ void TimeWidget::set24HourFormat(bool use24HourFormat) void TimeWidget::updateLocale(const QLocale &locale, const QString &shortTimeFormat, const QString &longDateFormat) { - m_locale = locale; + m_locale = locale.name().isEmpty() ? QLocale::system() : locale; if (!shortTimeFormat.isEmpty()) m_shortTimeFormat = shortTimeFormat; if (!longDateFormat.isEmpty())