From 8256220a512e71be73d2be0af68cf92bb7365c76 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 13 Sep 2022 18:02:13 +0800 Subject: [PATCH] ui: multilang date (#25741) * multilang date * update translations * add language to uistate * update translations * use it here too Co-authored-by: sshane old-commit-hash: 27e1ec8fd31192696cef70e4c6a98cbe7c3ba15a --- selfdrive/ui/qt/home.cc | 4 +++- selfdrive/ui/qt/offroad/settings.cc | 3 +-- selfdrive/ui/translations/main_ja.ts | 4 ++-- selfdrive/ui/translations/main_ko.ts | 4 ++-- selfdrive/ui/translations/main_pt-BR.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHS.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHT.ts | 4 ++-- selfdrive/ui/ui.cc | 1 + selfdrive/ui/ui.h | 1 + 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index 0edeb252b7..435ba9056a 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -183,7 +183,9 @@ void OffroadHome::hideEvent(QHideEvent *event) { } void OffroadHome::refresh() { - date->setText(QDateTime::currentDateTime().toString("dddd, MMMM d")); + QString locale_name = QString(uiState()->language).replace("main_", ""); + QString dateString = QLocale(locale_name).toString(QDateTime::currentDateTime(), "dddd, MMMM d"); + date->setText(dateString); bool updateAvailable = update_widget->refresh(); int alerts = alerts_widget->refresh(); diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index e5e5634545..7a5a40c193 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -189,8 +189,7 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) { auto translateBtn = new ButtonControl(tr("Change Language"), tr("CHANGE"), ""); connect(translateBtn, &ButtonControl::clicked, [=]() { QMap langs = getSupportedLanguages(); - QString currentLang = QString::fromStdString(Params().get("LanguageSetting")); - QString selection = MultiOptionDialog::getSelection(tr("Select a language"), langs.keys(), langs.key(currentLang), this); + QString selection = MultiOptionDialog::getSelection(tr("Select a language"), langs.keys(), langs.key(uiState()->language), this); if (!selection.isEmpty()) { // put language setting, exit Qt UI, and trigger fast restart Params().put("LanguageSetting", langs[selection].toStdString()); diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index a0b2a99866..9be6658d19 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -526,7 +526,7 @@ location set 更新 - + ALERTS 警告 @@ -539,7 +539,7 @@ location set PairingPopup - + Pair your device to your comma account デバイスと comma アカウントを連携する diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 5d7df2162e..3e329a72ab 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -526,7 +526,7 @@ location set 업데이트 - + ALERTS 알림 @@ -539,7 +539,7 @@ location set PairingPopup - + Pair your device to your comma account 장치를 콤마 계정과 페어링합니다 diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 2b3acb369f..b729678a2c 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -527,7 +527,7 @@ trabalho definido ATUALIZAÇÃO - + ALERTS ALERTAS @@ -540,7 +540,7 @@ trabalho definido PairingPopup - + Pair your device to your comma account Pareie seu dispositivo à sua conta comma diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index a00bf28303..606e70726f 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -524,7 +524,7 @@ location set 更新 - + ALERTS 警报 @@ -537,7 +537,7 @@ location set PairingPopup - + Pair your device to your comma account 将您的设备与comma账号配对 diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 52bd301364..b5b737ca25 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -526,7 +526,7 @@ location set 更新 - + ALERTS 提醒 @@ -539,7 +539,7 @@ location set PairingPopup - + Pair your device to your comma account 將設備與您的 comma 帳號配對 diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index b208945fe2..2722b68f17 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -236,6 +236,7 @@ UIState::UIState(QObject *parent) : QObject(parent) { Params params; wide_camera = params.getBool("WideCameraOnly"); prime_type = std::atoi(params.get("PrimeType").c_str()); + language = QString::fromStdString(params.get("LanguageSetting")); // update timer timer = new QTimer(this); diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index 08ae16ab24..b4ec900eef 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -127,6 +127,7 @@ public: bool awake; int prime_type = 0; + QString language; QTransform car_space_transform; bool wide_camera;