raylib: multilang

.gitignore

@@ -37,6 +37,7 @@ a.out
 *.pyxbldc
 *.vcd
 *.qm
+*.mo
 *_pyx.cpp
 config.json
 clcache

pyproject.toml

@@ -177,7 +177,7 @@ quiet-level = 3
 # if you've got a short variable name that's getting flagged, add it here
 ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite"
 builtin = "clear,rare,informal,code,names,en-GB_to_en-US"
-skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.ts, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*, docs/assets/*, tools/plotjuggler/layouts/*"
+skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.ts, *.po, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*, docs/assets/*, tools/plotjuggler/layouts/*"
 
 [tool.mypy]
 python_version = "3.11"

selfdrive/SConscript

@@ -3,5 +3,4 @@ SConscript(['controls/lib/lateral_mpc_lib/SConscript'])
 SConscript(['controls/lib/longitudinal_mpc_lib/SConscript'])
 SConscript(['locationd/SConscript'])
 SConscript(['modeld/SConscript'])
-if GetOption('extras'):
-  SConscript(['ui/SConscript'])
+SConscript(['ui/SConscript'])

selfdrive/ui/SConscript

@@ -1,98 +1,111 @@
+import os
 import json
 Import('env', 'qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations')
 
-base_libs = [common, messaging, visionipc, transformations,
-             'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
-
-if arch == 'larch64':
-  base_libs.append('EGL')
-
-if arch == "Darwin":
-  del base_libs[base_libs.index('OpenCL')]
-  qt_env['FRAMEWORKS'] += ['OpenCL']
-
-# FIXME: remove this once we're on 5.15 (24.04)
-qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
-
-qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], LIBS=base_libs)
-widgets_src = ["qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/prime_state.cc",
-               "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
-               "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
-               "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc",
-               "qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"]
-
-widgets = qt_env.Library("qt_widgets", widgets_src, LIBS=base_libs)
-Export('widgets')
-qt_libs = [widgets, qt_util] + base_libs
-
-qt_src = ["main.cc", "ui.cc", "qt/sidebar.cc", "qt/body.cc",
-          "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc",
-          "qt/offroad/software_settings.cc", "qt/offroad/developer_panel.cc", "qt/offroad/onboarding.cc",
-          "qt/offroad/driverview.cc", "qt/offroad/experimental_mode.cc", "qt/offroad/firehose.cc",
-          "qt/onroad/onroad_home.cc", "qt/onroad/annotated_camera.cc", "qt/onroad/model.cc",
-          "qt/onroad/buttons.cc", "qt/onroad/alerts.cc", "qt/onroad/driver_monitoring.cc", "qt/onroad/hud.cc"]
-
-# build translation files
+# compile gettext .po -> .mo translations
 with open(File("translations/languages.json").abspath) as f:
   languages = json.loads(f.read())
-translation_sources = [f"#selfdrive/ui/translations/{l}.ts" for l in languages.values()]
-translation_targets = [src.replace(".ts", ".qm") for src in translation_sources]
-lrelease_bin = 'third_party/qt5/larch64/bin/lrelease' if arch == 'larch64' else 'lrelease'
-
-lrelease = qt_env.Command(translation_targets, translation_sources, f"{lrelease_bin} $SOURCES")
-qt_env.NoClean(translation_sources)
-qt_env.Precious(translation_sources)
-
-# create qrc file for compiled translations to include with assets
-translations_assets_src = "#selfdrive/assets/translations_assets.qrc"
-with open(File(translations_assets_src).abspath, 'w') as f:
-  f.write('<!DOCTYPE RCC><RCC version="1.0">\n<qresource>\n')
-  f.write('\n'.join([f'<file alias="{l}">../ui/translations/{l}.qm</file>' for l in languages.values()]))
-  f.write('\n</qresource>\n</RCC>')
-
-# build assets
-assets = "#selfdrive/assets/assets.cc"
-assets_src = "#selfdrive/assets/assets.qrc"
-qt_env.Command(assets, [assets_src, translations_assets_src], f"rcc $SOURCES -o $TARGET")
-qt_env.Depends(assets, Glob('#selfdrive/assets/*', exclude=[assets, assets_src, translations_assets_src, "#selfdrive/assets/assets.o"]) + [lrelease])
-asset_obj = qt_env.Object("assets", assets)
-
-# build main UI
-qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs)
+
+po_sources = [f"#selfdrive/ui/translations/app_{l}.po" for l in languages.values()]
+po_sources = [src for src in po_sources if os.path.exists(File(src).abspath)]
+mo_targets = [src.replace(".po", ".mo") for src in po_sources]
+mo_build = []
+for src, tgt in zip(po_sources, mo_targets):
+  mo_build.append(qt_env.Command(tgt, src, "msgfmt -o $TARGET $SOURCE"))
+mo_alias = qt_env.Alias('mo', mo_build)
+qt_env.AlwaysBuild(mo_alias)
+
 if GetOption('extras'):
-  qt_src.remove("main.cc")  # replaced by test_runner
-  qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)
-
-  # build installers
-  if arch != "Darwin":
-    raylib_env = env.Clone()
-    raylib_env['LIBPATH'] += [f'#third_party/raylib/{arch}/']
-    raylib_env['LINKFLAGS'].append('-Wl,-strip-debug')
-
-    raylib_libs = common + ["raylib"]
-    if arch == "larch64":
-      raylib_libs += ["GLESv2", "EGL", "gbm", "drm"]
-    else:
-      raylib_libs += ["GL"]
-
-    release = "release3"
-    installers = [
-      ("openpilot", release),
-      ("openpilot_test", f"{release}-staging"),
-      ("openpilot_nightly", "nightly"),
-      ("openpilot_internal", "nightly-dev"),
-    ]
-
-    cont = raylib_env.Command("installer/continue_openpilot.o", "installer/continue_openpilot.sh",
-                              "ld -r -b binary -o $TARGET $SOURCE")
-    inter = raylib_env.Command("installer/inter_ttf.o", "installer/inter-ascii.ttf",
-                               "ld -r -b binary -o $TARGET $SOURCE")
-    for name, branch in installers:
-      d = {'BRANCH': f"'\"{branch}\"'"}
-      if "internal" in name:
-        d['INTERNAL'] = "1"
-
-      obj = raylib_env.Object(f"installer/installers/installer_{name}.o", ["installer/installer.cc"], CPPDEFINES=d)
-      f = raylib_env.Program(f"installer/installers/installer_{name}", [obj, cont, inter], LIBS=raylib_libs)
-      # keep installers small
-      assert f[0].get_size() < 1900*1e3, f[0].get_size()
+  base_libs = [common, messaging, visionipc, transformations,
+               'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
+
+  if arch == 'larch64':
+    base_libs.append('EGL')
+
+  if arch == "Darwin":
+    del base_libs[base_libs.index('OpenCL')]
+    qt_env['FRAMEWORKS'] += ['OpenCL']
+
+  # FIXME: remove this once we're on 5.15 (24.04)
+  qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
+
+  qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], LIBS=base_libs)
+  widgets_src = ["qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/prime_state.cc",
+                 "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
+                 "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
+                 "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc",
+                 "qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"]
+
+  widgets = qt_env.Library("qt_widgets", widgets_src, LIBS=base_libs)
+  Export('widgets')
+  qt_libs = [widgets, qt_util] + base_libs
+
+  qt_src = ["main.cc", "ui.cc", "qt/sidebar.cc", "qt/body.cc",
+            "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc",
+            "qt/offroad/software_settings.cc", "qt/offroad/developer_panel.cc", "qt/offroad/onboarding.cc",
+            "qt/offroad/driverview.cc", "qt/offroad/experimental_mode.cc", "qt/offroad/firehose.cc",
+            "qt/onroad/onroad_home.cc", "qt/onroad/annotated_camera.cc", "qt/onroad/model.cc",
+            "qt/onroad/buttons.cc", "qt/onroad/alerts.cc", "qt/onroad/driver_monitoring.cc", "qt/onroad/hud.cc"]
+
+  # build translation files
+  translation_sources = [f"#selfdrive/ui/translations/{l}.ts" for l in languages.values()]
+  translation_targets = [src.replace(".ts", ".qm") for src in translation_sources]
+  lrelease_bin = 'third_party/qt5/larch64/bin/lrelease' if arch == 'larch64' else 'lrelease'
+
+  lrelease = qt_env.Command(translation_targets, translation_sources, f"{lrelease_bin} $SOURCES")
+  qt_env.NoClean(translation_sources)
+  qt_env.Precious(translation_sources)
+
+  # create qrc file for compiled translations to include with assets
+  translations_assets_src = "#selfdrive/assets/translations_assets.qrc"
+  with open(File(translations_assets_src).abspath, 'w') as f:
+    f.write('<!DOCTYPE RCC><RCC version="1.0">\n<qresource>\n')
+    f.write('\n'.join([f'<file alias="{l}">../ui/translations/{l}.qm</file>' for l in languages.values()]))
+    f.write('\n</qresource>\n</RCC>')
+
+  # build assets
+  assets = "#selfdrive/assets/assets.cc"
+  assets_src = "#selfdrive/assets/assets.qrc"
+  qt_env.Command(assets, [assets_src, translations_assets_src], f"rcc $SOURCES -o $TARGET")
+  qt_env.Depends(assets, Glob('#selfdrive/assets/*', exclude=[assets, assets_src, translations_assets_src, "#selfdrive/assets/assets.o"]) + [lrelease])
+  asset_obj = qt_env.Object("assets", assets)
+
+  # build main UI
+  qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs)
+  if GetOption('extras'):
+    qt_src.remove("main.cc")  # replaced by test_runner
+    qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)
+
+    # build installers
+    if arch != "Darwin":
+      raylib_env = env.Clone()
+      raylib_env['LIBPATH'] += [f'#third_party/raylib/{arch}/']
+      raylib_env['LINKFLAGS'].append('-Wl,-strip-debug')
+
+      raylib_libs = common + ["raylib"]
+      if arch == "larch64":
+        raylib_libs += ["GLESv2", "EGL", "gbm", "drm"]
+      else:
+        raylib_libs += ["GL"]
+
+      release = "release3"
+      installers = [
+        ("openpilot", release),
+        ("openpilot_test", f"{release}-staging"),
+        ("openpilot_nightly", "nightly"),
+        ("openpilot_internal", "nightly-dev"),
+      ]
+
+      cont = raylib_env.Command("installer/continue_openpilot.o", "installer/continue_openpilot.sh",
+                                "ld -r -b binary -o $TARGET $SOURCE")
+      inter = raylib_env.Command("installer/inter_ttf.o", "installer/inter-ascii.ttf",
+                                 "ld -r -b binary -o $TARGET $SOURCE")
+      for name, branch in installers:
+        d = {'BRANCH': f"'\"{branch}\"'"}
+        if "internal" in name:
+          d['INTERNAL'] = "1"
+
+        obj = raylib_env.Object(f"installer/installers/installer_{name}.o", ["installer/installer.cc"], CPPDEFINES=d)
+        f = raylib_env.Program(f"installer/installers/installer_{name}", [obj, cont, inter], LIBS=raylib_libs)
+        # keep installers small
+        assert f[0].get_size() < 1900*1e3, f[0].get_size()

selfdrive/ui/layouts/settings/developer.py

@@ -6,23 +6,24 @@
 from openpilot.system.ui.widgets.scroller import Scroller
 from openpilot.system.ui.widgets.confirm_dialog import ConfirmDialog
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.multilang import tr
+from openpilot.system.ui.lib.multilang import tr, tr_noop
 from openpilot.system.ui.widgets import DialogResult
 
 # Description constants
 DESCRIPTIONS = {
-  'enable_adb': tr(
+  'enable_adb': tr_noop(
     "ADB (Android Debug Bridge) allows connecting to your device over USB or over the network. " +
     "See https://docs.comma.ai/how-to/connect-to-comma for more info."
   ),
-  'ssh_key': tr(
+  'ssh_key': tr_noop(
     "Warning: This grants SSH access to all public keys in your GitHub settings. Never enter a GitHub username " +
     "other than your own. A comma employee will NEVER ask you to add their GitHub username."
   ),
-  'alpha_longitudinal': tr(
+  'alpha_longitudinal': tr_noop(
     "<b>WARNING: openpilot longitudinal control is in alpha for this car and will disable Automatic Emergency Braking (AEB).</b><br><br>" +
     "On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. " +
-    "Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when enabling openpilot longitudinal control alpha."
+    "Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when enabling openpilot longitudinal control alpha. " +
+    "Changing this setting will restart openpilot if the car is powered on."
   ),
 }
 
@@ -35,47 +36,45 @@ def __init__(self):
 
     # Build items and keep references for callbacks/state updates
     self._adb_toggle = toggle_item(
-      tr("Enable ADB"),
-      description=DESCRIPTIONS["enable_adb"],
+      lambda: tr("Enable ADB"),
+      description=lambda: DESCRIPTIONS["enable_adb"],
       initial_state=self._params.get_bool("AdbEnabled"),
       callback=self._on_enable_adb,
       enabled=ui_state.is_offroad,
     )
 
     # SSH enable toggle + SSH key management
     self._ssh_toggle = toggle_item(
-      tr("Enable SSH"),
+      lambda: tr("Enable SSH"),
       description="",
       initial_state=self._params.get_bool("SshEnabled"),
       callback=self._on_enable_ssh,
     )
-    self._ssh_keys = ssh_key_item("SSH Keys", description=DESCRIPTIONS["ssh_key"])
+    self._ssh_keys = ssh_key_item(lambda: tr("SSH Keys"), description=lambda: DESCRIPTIONS["ssh_key"])
 
     self._joystick_toggle = toggle_item(
-      tr("Joystick Debug Mode"),
+      lambda: tr("Joystick Debug Mode"),
       description="",
       initial_state=self._params.get_bool("JoystickDebugMode"),
       callback=self._on_joystick_debug_mode,
       enabled=ui_state.is_offroad,
     )
 
     self._long_maneuver_toggle = toggle_item(
-      tr("Longitudinal Maneuver Mode"),
+      lambda: tr("Longitudinal Maneuver Mode"),
       description="",
       initial_state=self._params.get_bool("LongitudinalManeuverMode"),
       callback=self._on_long_maneuver_mode,
     )
 
     self._alpha_long_toggle = toggle_item(
-      tr("openpilot Longitudinal Control (Alpha)"),
-      description=DESCRIPTIONS["alpha_longitudinal"],
+      lambda: tr("openpilot Longitudinal Control (Alpha)"),
+      description=lambda: DESCRIPTIONS["alpha_longitudinal"],
       initial_state=self._params.get_bool("AlphaLongitudinalEnabled"),
       callback=self._on_alpha_long_enabled,
       enabled=lambda: not ui_state.engaged,
     )
 
-    self._alpha_long_toggle.set_description(self._alpha_long_toggle.description + " Changing this setting will restart openpilot if the car is powered on.")
-
     items = [
       self._adb_toggle,
       self._ssh_toggle,