Merge pull request #1900 from ia/z-localization

Set "Zzz " as universal var instead of `SleepingSimpleString` "translatable" string
Ralim · Apr 8, 2024 · 35d4b18 · 35d4b18
2 parents 1af6c07 + 79c6af8
commit 35d4b18
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 112 deletions.
diff --git a/Translations/make_translation.py b/Translations/make_translation.py
@@ -146,6 +146,7 @@ def get_constants() -> List[Tuple[str, str]]:
         ("SmallSymbolState", "State"),
         ("SmallSymbolNoVBus", "No VBus"),
         ("SmallSymbolVBus", "VBus"),
+        ("LargeSymbolSleep", "Zzz "),
     ]
 
 

diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Сілкаванне В: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Чаканне...\n"
         },

diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Входно V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Сън...\n"
         },

diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Napětí: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Režim spánku...\n"
         },

diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Input V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Dvale...\n"
         },

diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "V Eingang: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Ruhemodus...\n"
         },

diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Είσοδος V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Υπνος...\n"
         },

diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Input V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Sleeping...\n"
         },

diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Voltaje: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "En reposo...\n"
         },

diff --git a/Translations/translation_ET.json b/Translations/translation_ET.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Sisend V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Unerežiim...\n"
         },

diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Jännite: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Lepotila...\n"
         },

diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "V d'entrée: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "En veille...\n"
         },

diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Napon V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "SPAVAM...\n"
         },

diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Bemenet V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Alvás...\n"
         },

diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "V in: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Riposo\n"
         },

diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Input V: "
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Sleeping..."
         },

diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Įvestis V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Miegu...\n"
         },

diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Innspenn.: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Dvale...\n"
         },

diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Ingangs spanning: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Slaapt...\n"
         },

diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Voedingsspanning: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Slaapstand...\n"
         },

diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Nap. wej.: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Tr. uśpienia\n"
         },

diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Tensão: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Repouso...\n"
         },

diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Intrare V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Adormit...\n"
         },

diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Питание(В):\n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Сон...\n"
         },

diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Vstupné U: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Pokojový režim.\n"
         },

diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Vhodna U: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Spim...\n"
         },

diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Ул. напон: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Спавање...\n"
         },

diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Ul. napon: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Spavanje...\n"
         },

diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Inspän. V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Viloläge...\n"
         },

diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Giriş V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Bekleme Modu...\n"
         },

diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Жив.(B): \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Очікування...\n"
         },

diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Đau vào V: \n"
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Đang ngu...\n"
         },

diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Input V: "
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Sleeping..."
         },

diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "VIN: "
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Zzzz..."
         },

diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json
@@ -51,9 +51,6 @@
         "InputVoltageString": {
             "message": "Input V: "
         },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
         "SleepingAdvancedString": {
             "message": "Sleeping..."
         },

diff --git a/Translations/translations_definitions.json b/Translations/translations_definitions.json
@@ -95,14 +95,6 @@
             ],
             "description": "Shown in profile mode while cooling down"
         },
-        {
-            "id": "SleepingSimpleString",
-            "maxLen": 4,
-            "exclude": [
-                "NO_SLEEP_MODE"
-            ],
-            "description": "The text shown to indicate the unit is in sleep mode when the advanced view is NOT on."
-        },
         {
             "id": "SleepingAdvancedString",
             "maxLen": 15,

diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h
@@ -48,6 +48,8 @@ extern const char *SmallSymbolState;
 extern const char *SmallSymbolNoVBus;
 extern const char *SmallSymbolVBus;
 
+extern const char *LargeSymbolSleep;
+
 extern const char *DebugMenu[];
 extern const char *AccelTypeNames[];
 extern const char *PowerSourceNames[];
@@ -127,7 +129,6 @@ struct TranslationIndexTable {
   uint16_t ProfilePreheatString;
   uint16_t ProfileCooldownString;
 
-  uint16_t SleepingSimpleString;
   uint16_t SleepingAdvancedString;
   uint16_t SleepingTipAdvancedString;
   uint16_t DeviceFailedValidationWarning;

diff --git a/source/Core/Threads/OperatingModes/Sleep.cpp b/source/Core/Threads/OperatingModes/Sleep.cpp
@@ -45,7 +45,7 @@ OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *c
     printVoltage();
     OLED::print(SmallSymbolVolts, FontStyle::SMALL);
   } else {
-    OLED::print(translatedString(Tr->SleepingSimpleString), FontStyle::LARGE);
+    OLED::print(LargeSymbolSleep, FontStyle::LARGE);
     OLED::printNumber(tipTemp, 3, FontStyle::LARGE);
     OLED::printSymbolDeg(FontStyle::EXTRAS);
   }