Multilang: remove main prefix (#36406)

* rename

* fix

common/params_keys.h

@@ -66,7 +66,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"IsTakingSnapshot", {CLEAR_ON_MANAGER_START, BOOL}},
     {"IsTestedBranch", {CLEAR_ON_MANAGER_START, BOOL}},
     {"JoystickDebugMode", {CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION, BOOL}},
-    {"LanguageSetting", {PERSISTENT, STRING, "main_en"}},
+    {"LanguageSetting", {PERSISTENT, STRING, "en"}},
     {"LastAthenaPingTime", {CLEAR_ON_MANAGER_START, INT}},
     {"LastGPSPosition", {PERSISTENT, STRING}},
     {"LastManagerExitReason", {CLEAR_ON_MANAGER_START, STRING}},

selfdrive/ui/.gitignore

@@ -1,7 +1,7 @@
 moc_*
 *.moc
 
-translations/main_test_en.*
+translations/test_en.*
 
 ui
 mui

selfdrive/ui/tests/create_test_translations.sh

@@ -4,8 +4,8 @@ set -e
 
 UI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"/..
 TEST_TEXT="(WRAPPED_SOURCE_TEXT)"
-TEST_TS_FILE=$UI_DIR/translations/main_test_en.ts
-TEST_QM_FILE=$UI_DIR/translations/main_test_en.qm
+TEST_TS_FILE=$UI_DIR/translations/test_en.ts
+TEST_QM_FILE=$UI_DIR/translations/test_en.qm
 
 # translation strings
 UNFINISHED="<translation type=\"unfinished\"><\/translation>"

selfdrive/ui/tests/test_runner.cc

@@ -10,7 +10,7 @@ int main(int argc, char **argv) {
   // unit tests for Qt
   QApplication app(argc, argv);
 
-  QString language_file = "main_test_en";
+  QString language_file = "test_en";
   // FIXME: pytest-cpp considers this print as a test case
   qDebug() << "Loading language:" << language_file;
 

selfdrive/ui/tests/test_translations.py

@@ -93,7 +93,7 @@ class TestTranslations:
   def test_bad_language(self):
     IGNORED_WORDS = {'pédale'}
 
-    match = re.search(r'_([a-zA-Z]{2,3})', self.file)
+    match = re.search(r'([a-zA-Z]{2,3})', self.file)
     assert match, f"{self.name} - could not parse language"
 
     try:

selfdrive/ui/translations/auto_translate.py

@@ -26,7 +26,7 @@ def get_language_files(languages: list[str] = None) -> dict[str, pathlib.Path]:
 
     for filename in language_dict.values():
       path = TRANSLATIONS_DIR / f"{filename}.ts"
-      language = path.stem.split("main_")[1]
+      language = path.stem
 
       if languages is None or language in languages:
         files[language] = path

selfdrive/ui/translations/languages.json

@@ -1,14 +1,14 @@
 {
-  "English": "main_en",
-  "Deutsch": "main_de",
-  "Français": "main_fr",
-  "Português": "main_pt-BR",
-  "Español": "main_es",
-  "Türkçe": "main_tr",
-  "العربية": "main_ar",
-  "ไทย": "main_th",
-  "中文（繁體）": "main_zh-CHT",
-  "中文（简体）": "main_zh-CHS",
-  "한국어": "main_ko",
-  "日本語": "main_ja"
+  "English": "en",
+  "Deutsch": "de",
+  "Français": "fr",
+  "Português": "pt-BR",
+  "Español": "es",
+  "Türkçe": "tr",
+  "العربية": "ar",
+  "ไทย": "th",
+  "中文（繁體）": "zh-CHT",
+  "中文（简体）": "zh-CHS",
+  "한국어": "ko",
+  "日本語": "ja"
 }

selfdrive/ui/update_translations.py

@@ -9,7 +9,7 @@ UI_DIR = os.path.join(BASEDIR, "selfdrive", "ui")
 TRANSLATIONS_DIR = os.path.join(UI_DIR, "translations")
 LANGUAGES_FILE = os.path.join(TRANSLATIONS_DIR, "languages.json")
 TRANSLATIONS_INCLUDE_FILE = os.path.join(TRANSLATIONS_DIR, "alerts_generated.h")
-PLURAL_ONLY = ["main_en"]  # base language, only create entries for strings with plural forms
+PLURAL_ONLY = ["en"]  # base language, only create entries for strings with plural forms
 
 
 def generate_translations_include():