sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nav: wrap strings (#25089)

Browse Source 
* Wrap nav strings and translate

* Update QM

* Update QM
old-commit-hash: cbff8fcbd0
taco
Shane Smiskol 3 years ago committed by GitHub
parent 23de7b166e
commit 314166f5fd
7 changed files with 209 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      selfdrive/ui/qt/maps/map.cc
  2. 4
      selfdrive/ui/translations/main_ko.qm
  3. 64
      selfdrive/ui/translations/main_ko.ts
  4. 4
      selfdrive/ui/translations/main_zh-CHS.qm
  5. 64
      selfdrive/ui/translations/main_zh-CHS.ts
  6. 4
      selfdrive/ui/translations/main_zh-CHT.qm
  7. 64
      selfdrive/ui/translations/main_zh-CHT.ts

22
selfdrive/ui/qt/maps/map.cc
Unescape View File

@ -175,7 +175,7 @@ void MapWindow::updateState(const UIState &s) {
loaded_once = loaded_once || m_map->isFullyLoaded(); loaded_once = loaded_once || m_map->isFullyLoaded();
if (!loaded_once) { if (!loaded_once) {
map_instructions->showError("Map Loading"); map_instructions->showError(tr("Map Loading"));
return; return;
} }
@ -192,7 +192,7 @@ void MapWindow::updateState(const UIState &s) {
carPosSource["data"] = QVariant::fromValue<QMapbox::Feature>(feature1); carPosSource["data"] = QVariant::fromValue<QMapbox::Feature>(feature1);
m_map->updateSource("carPosSource", carPosSource); m_map->updateSource("carPosSource", carPosSource);
} else { } else {
map_instructions->showError("Waiting for GPS"); map_instructions->showError(tr("Waiting for GPS"));
} }
if (pan_counter == 0) { if (pan_counter == 0) {
@ -418,10 +418,10 @@ void MapInstructions::updateDistance(float d) {
if (uiState()->scene.is_metric) { if (uiState()->scene.is_metric) {
if (d > 500) { if (d > 500) {
distance_str.setNum(d / 1000, 'f', 1); distance_str.setNum(d / 1000, 'f', 1);
distance_str += " km"; distance_str += tr(" km");
} else { } else {
distance_str.setNum(50 * int(d / 50)); distance_str.setNum(50 * int(d / 50));
distance_str += " m"; distance_str += tr(" m");
} }
} else { } else {
float miles = d * METER_TO_MILE; float miles = d * METER_TO_MILE;
@ -429,10 +429,10 @@ void MapInstructions::updateDistance(float d) {
if (feet > 500) { if (feet > 500) {
distance_str.setNum(miles, 'f', 1); distance_str.setNum(miles, 'f', 1);
distance_str += " mi"; distance_str += tr(" mi");
} else { } else {
distance_str.setNum(50 * int(feet / 50)); distance_str.setNum(50 * int(feet / 50));
distance_str += " ft"; distance_str += tr(" ft");
} }
} }
@ -615,7 +615,7 @@ void MapETA::updateETA(float s, float s_typical, float d) {
auto eta_time = QDateTime::currentDateTime().addSecs(s).time(); auto eta_time = QDateTime::currentDateTime().addSecs(s).time();
if (params.getBool("NavSettingTime24h")) { if (params.getBool("NavSettingTime24h")) {
eta->setText(eta_time.toString("HH:mm")); eta->setText(eta_time.toString("HH:mm"));
eta_unit->setText("eta"); eta_unit->setText(tr("eta"));
} else { } else {
auto t = eta_time.toString("h:mm a").split(' '); auto t = eta_time.toString("h:mm a").split(' ');
eta->setText(t[0]); eta->setText(t[0]);
@ -625,11 +625,11 @@ void MapETA::updateETA(float s, float s_typical, float d) {
// Remaining time // Remaining time
if (s < 3600) { if (s < 3600) {
time->setText(QString::number(int(s / 60))); time->setText(QString::number(int(s / 60)));
time_unit->setText("min"); time_unit->setText(tr("min"));
} else { } else {
int hours = int(s) / 3600; int hours = int(s) / 3600;
time->setText(QString::number(hours) + ":" + QString::number(int((s - hours * 3600) / 60)).rightJustified(2, '0')); time->setText(QString::number(hours) + ":" + QString::number(int((s - hours * 3600) / 60)).rightJustified(2, '0'));
time_unit->setText("hr"); time_unit->setText(tr("hr"));
} }
QString color; QString color;
@ -649,10 +649,10 @@ void MapETA::updateETA(float s, float s_typical, float d) {
float num = 0; float num = 0;
if (uiState()->scene.is_metric) { if (uiState()->scene.is_metric) {
num = d / 1000.0; num = d / 1000.0;
distance_unit->setText("km"); distance_unit->setText(tr("km"));
} else { } else {
num = d * METER_TO_MILE; num = d * METER_TO_MILE;
distance_unit->setText("mi"); distance_unit->setText(tr("mi"));
} }
distance_str.setNum(num, 'f', num < 100 ? 1 : 0); distance_str.setNum(num, 'f', num < 100 ? 1 : 0);

4
selfdrive/ui/translations/main_ko.qm
Unescape View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:194b46eb36b6b4c98d9d0a6db7bf926099dbb8d72dcb1d50566c4b26cf540c8d oid sha256:55407c3b2fb44d7104d9faec6a4b2618ed5718533d316a91ccb14083d6c8c4e3
size 19449 size 19997

64
selfdrive/ui/translations/main_ko.ts
Unescape View File

@ -340,6 +340,57 @@
<translation>파일갱신： </translation> <translation>파일갱신： </translation>
</message> </message>
</context> </context>
<context>
<name>MapETA</name>
<message>
<location filename="../qt/maps/map.cc" line="618"/>
<source>eta</source>
<translation>에타</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="628"/>
<source>min</source>
<translation>분</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="632"/>
<source>hr</source>
<translation>시간</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="652"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="655"/>
<source>mi</source>
<translation>mi</translation>
</message>
</context>
<context>
<name>MapInstructions</name>
<message>
<location filename="../qt/maps/map.cc" line="421"/>
<source> km</source>
<translation> km</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="424"/>
<source> m</source>
<translation> m</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="432"/>
<source> mi</source>
<translation> mi</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="435"/>
<source> ft</source>
<translation> ft</translation>
</message>
</context>
<context> <context>
<name>MapPanel</name> <name>MapPanel</name>
<message> <message>
@ -389,6 +440,19 @@ location set</source>
<translation>최근 경로 없음</translation> <translation>최근 경로 없음</translation>
</message> </message>
</context> </context>
<context>
<name>MapWindow</name>
<message>
<location filename="../qt/maps/map.cc" line="178"/>
<source>Map Loading</source>
<translation>지도 로딩</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="195"/>
<source>Waiting for GPS</source>
<translation>GPS를 기다리는 중</translation>
</message>
</context>
<context> <context>
<name>MultiOptionDialog</name> <name>MultiOptionDialog</name>
<message> <message>

4
selfdrive/ui/translations/main_zh-CHS.qm
Unescape View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ef08cf58d66497a054c8bf978aebeffa3bb74772b80cfa07cfcbc49e2b111e17 oid sha256:9204cf2eb7ec07ff9f96e715d3ea322f11ed6fe65c8a3f9c1feb635281657611
size 17919 size 18457

64
selfdrive/ui/translations/main_zh-CHS.ts
Unescape View File

@ -340,6 +340,57 @@
<translation>更新文件： </translation> <translation>更新文件： </translation>
</message> </message>
</context> </context>
<context>
<name>MapETA</name>
<message>
<location filename="../qt/maps/map.cc" line="618"/>
<source>eta</source>
<translation>埃塔</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="628"/>
<source>min</source>
<translation>分钟</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="632"/>
<source>hr</source>
<translation>小时</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="652"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="655"/>
<source>mi</source>
<translation>mi</translation>
</message>
</context>
<context>
<name>MapInstructions</name>
<message>
<location filename="../qt/maps/map.cc" line="421"/>
<source> km</source>
<translation> km</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="424"/>
<source> m</source>
<translation> m</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="432"/>
<source> mi</source>
<translation> mi</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="435"/>
<source> ft</source>
<translation> ft</translation>
</message>
</context>
<context> <context>
<name>MapPanel</name> <name>MapPanel</name>
<message> <message>
@ -389,6 +440,19 @@ location set</source>
<translation>没有最近的目的地</translation> <translation>没有最近的目的地</translation>
</message> </message>
</context> </context>
<context>
<name>MapWindow</name>
<message>
<location filename="../qt/maps/map.cc" line="178"/>
<source>Map Loading</source>
<translation>地图加载</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="195"/>
<source>Waiting for GPS</source>
<translation>等待 GPS</translation>
</message>
</context>
<context> <context>
<name>MultiOptionDialog</name> <name>MultiOptionDialog</name>
<message> <message>

4
selfdrive/ui/translations/main_zh-CHT.qm
Unescape View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a8a04d85bc163299f9f79b45e5e9b1d44ade7926c9a254d57b1edd4372f51948 oid sha256:396d71e49401936a52987c6da3576ab70a7735f3251c5e7556c8ce088671d5b9
size 18031 size 18569

64
selfdrive/ui/translations/main_zh-CHT.ts
Unescape View File

@ -340,6 +340,57 @@
<translation>更新檔案： </translation> <translation>更新檔案： </translation>
</message> </message>
</context> </context>
<context>
<name>MapETA</name>
<message>
<location filename="../qt/maps/map.cc" line="618"/>
<source>eta</source>
<translation>埃塔</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="628"/>
<source>min</source>
<translation>分鐘</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="632"/>
<source>hr</source>
<translation>小時</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="652"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="655"/>
<source>mi</source>
<translation>mi</translation>
</message>
</context>
<context>
<name>MapInstructions</name>
<message>
<location filename="../qt/maps/map.cc" line="421"/>
<source> km</source>
<translation> km</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="424"/>
<source> m</source>
<translation> m</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="432"/>
<source> mi</source>
<translation> mi</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="435"/>
<source> ft</source>
<translation> ft</translation>
</message>
</context>
<context> <context>
<name>MapPanel</name> <name>MapPanel</name>
<message> <message>
@ -394,6 +445,19 @@ location set</source>
<translation>沒有最近的導航記錄</translation> <translation>沒有最近的導航記錄</translation>
</message> </message>
</context> </context>
<context>
<name>MapWindow</name>
<message>
<location filename="../qt/maps/map.cc" line="178"/>
<source>Map Loading</source>
<translation>地圖加載</translation>
</message>
<message>
<location filename="../qt/maps/map.cc" line="195"/>
<source>Waiting for GPS</source>
<translation>等待 GPS</translation>
</message>
</context>
<context> <context>
<name>MultiOptionDialog</name> <name>MultiOptionDialog</name>
<message> <message>

Write Preview
Loading…
Cancel
Save