Browse Source

🌐 Replace '=' with '{' for substitution

Scott Lahteine 1 year ago
parent
commit
2954bf2697

+ 3 - 3
Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp

@@ -44,7 +44,7 @@ uint8_t read_byte(const uint8_t *byte) { return *byte; }
  * Add a string, applying substitutions for the following characters:
  *
  *   $ displays the clipped string given by fstr or cstr
- *   = displays  '0'....'10' for indexes 0 - 10
+ *   { displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
@@ -57,9 +57,9 @@ void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nu
     if (wc > 255) wc |= 0x0080;
     const uint8_t ch = uint8_t(wc & 0x00FF);
 
-    if (ch == '=' || ch == '~' || ch == '*') {
+    if (ch == '{' || ch == '~' || ch == '*') {
       if (index >= 0) {
-        int8_t inum = index + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
+        int8_t inum = index + ((ch == '{') ? 0 : LCD_FIRST_TOOL);
         if (ch == '*') add_character('E');
         if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
         add_character('0' + inum);

+ 2 - 2
Marlin/src/lcd/language/language_cz.h

@@ -334,7 +334,7 @@ namespace Language_cz {
   LSTR MSG_STOP_PRINT                     = _UxGT("Zastavit tisk");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Tisk objektu");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Zrušit objekt");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Zrušit objekt =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Zrušit objekt {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Obnova výpadku");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Tisknout z SD");
   LSTR MSG_NO_MEDIA                       = _UxGT("Žádná SD karta");
@@ -512,7 +512,7 @@ namespace Language_cz {
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Vytáhněte, klikněte");
 
   LSTR MSG_MIX                            = _UxGT("Mix");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponenta =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponenta {");
   LSTR MSG_MIXER                          = _UxGT("Mixér");
   LSTR MSG_GRADIENT                       = _UxGT("Přechod");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Celý přechod");

+ 3 - 3
Marlin/src/lcd/language/language_de.h

@@ -277,7 +277,7 @@ namespace Language_de {
   LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violett");
   LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Weiß");
   LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Standard");
-  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanal =");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanal {");
   LSTR MSG_LEDS2                          = _UxGT("Lichter #2");
   LSTR MSG_NEO2_PRESETS                   = _UxGT("Licht #2 Voreinst.");
   LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Helligkeit");
@@ -461,7 +461,7 @@ namespace Language_de {
   LSTR MSG_END_LOOPS                      = _UxGT("Wiederholung beenden");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Objekt drucken");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Objekt abbrechen");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objekt abbrechen =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objekt abbrechen {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Wiederh. n. Stroma.");
   LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Druckauftrag fortset.");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Druck vom Medium");
@@ -692,7 +692,7 @@ namespace Language_de {
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Entfernen, klicken");
 
   LSTR MSG_MIX                            = _UxGT("Mix");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponente =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponente {");
   LSTR MSG_MIXER                          = _UxGT("Mixer");
   LSTR MSG_GRADIENT                       = _UxGT("Gradient"); // equal Farbverlauf
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Volle Gradient");

+ 5 - 5
Marlin/src/lcd/language/language_en.h

@@ -30,7 +30,7 @@
  * Substitutions are applied for the following characters when used in menu items titles:
  *
  *   $ displays an inserted string
- *   = displays  '0'....'10' for indexes 0 - 10
+ *   { displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
@@ -298,7 +298,7 @@ namespace Language_en {
   LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violet");
   LSTR MSG_SET_LEDS_WHITE                 = _UxGT("White");
   LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Default");
-  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Channel =");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Channel {");
   LSTR MSG_LEDS2                          = _UxGT("Lights #2");
   LSTR MSG_NEO2_PRESETS                   = _UxGT("Light #2 Presets");
   LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Brightness");
@@ -505,7 +505,7 @@ namespace Language_en {
     LSTR MSG_HOST_START_PRINT             = _UxGT("Start Host Print");
     LSTR MSG_PRINTING_OBJECT              = _UxGT("Printing Object");
     LSTR MSG_CANCEL_OBJECT                = _UxGT("Cancel Object");
-    LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Object =");
+    LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Object {");
     LSTR MSG_CONTINUE_PRINT_JOB           = _UxGT("Continue Print Job");
     LSTR MSG_MEDIA_MENU                   = _UxGT("Print from ") MEDIA_TYPE_EN;
     LSTR MSG_TURN_OFF                     = _UxGT("Turn off the printer");
@@ -514,7 +514,7 @@ namespace Language_en {
     LSTR MSG_HOST_START_PRINT             = _UxGT("Host Start");
     LSTR MSG_PRINTING_OBJECT              = _UxGT("Print Obj");
     LSTR MSG_CANCEL_OBJECT                = _UxGT("Cancel Obj");
-    LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Obj =");
+    LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Obj {");
     LSTR MSG_CONTINUE_PRINT_JOB           = _UxGT("Continue Job");
     LSTR MSG_MEDIA_MENU                   = MEDIA_TYPE_EN _UxGT(" Print");
     LSTR MSG_TURN_OFF                     = _UxGT("Turn off now");
@@ -757,7 +757,7 @@ namespace Language_en {
   LSTR MSG_MMU2_REMOVE_AND_CLICK          = _UxGT("Remove and click...");
 
   LSTR MSG_MIX                            = _UxGT("Mix");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Component =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Component {");
   LSTR MSG_MIXER                          = _UxGT("Mixer");
   LSTR MSG_GRADIENT                       = _UxGT("Gradient");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Full Gradient");

+ 2 - 2
Marlin/src/lcd/language/language_es.h

@@ -338,7 +338,7 @@ namespace Language_es {
   LSTR MSG_STOP_PRINT                     = _UxGT("Detener impresión");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Imprimiendo Objeto");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Objeto");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Objeto =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Objeto {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Rec. Fallo electrico");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Imprim. desde SD/FD");
   LSTR MSG_NO_MEDIA                       = _UxGT("SD/FD no presente");
@@ -510,7 +510,7 @@ namespace Language_es {
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Retirar, y pulsar");
 
   LSTR MSG_MIX                            = _UxGT("Mezcla");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Componente =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Componente {");
   LSTR MSG_MIXER                          = _UxGT("Miezclador");
   LSTR MSG_GRADIENT                       = _UxGT("Degradado");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Degradado Total");

+ 2 - 2
Marlin/src/lcd/language/language_fr.h

@@ -353,7 +353,7 @@ namespace Language_fr {
   LSTR MSG_STOP_PRINT                     = _UxGT("Arrêter impr.");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Impression objet");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Annuler objet");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Annuler objet =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Annuler objet {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Récup. coup.");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Impression SD");
   LSTR MSG_NO_MEDIA                       = _UxGT("Pas de média");
@@ -540,7 +540,7 @@ namespace Language_fr {
   LSTR MSG_MMU2_RESETTING                 = _UxGT("Réinit. MMU...");
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Retrait, click");
 
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Composante =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Composante {");
   LSTR MSG_MIXER                          = _UxGT("Mixeur");
   LSTR MSG_GRADIENT                       = _UxGT("Dégradé");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Dégradé complet");

+ 2 - 2
Marlin/src/lcd/language/language_fr_na.h

@@ -353,7 +353,7 @@ namespace Language_fr_na {
   LSTR MSG_STOP_PRINT                     = _UxGT("Arreter impr.");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Impression objet");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Annuler objet");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Annuler objet =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Annuler objet {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Recup. coup.");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Impression SD");
   LSTR MSG_NO_MEDIA                       = _UxGT("Pas de media");
@@ -543,7 +543,7 @@ namespace Language_fr_na {
   LSTR MSG_MMU2_RESETTING                 = _UxGT("Reinit. MMU...");
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Retrait, click");
 
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Composante =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Composante {");
   LSTR MSG_MIXER                          = _UxGT("Mixeur");
   LSTR MSG_GRADIENT                       = _UxGT("Degrade");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Degrade complet");

+ 3 - 3
Marlin/src/lcd/language/language_gl.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Galician language (ISO "gl")
+ * Galician language
  *
  * LCD Menu Messages
  * See also https://marlinfw.org/docs/development/lcd_language.html
@@ -342,7 +342,7 @@ namespace Language_gl {
   LSTR MSG_STOP_PRINT                     = _UxGT("Deter impresión");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Imprimindo Obxecto");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Obxecto");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Obxecto =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Obxecto {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Recuperar Impresión");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Tarxeta SD");
   LSTR MSG_NO_MEDIA                       = _UxGT("Sen tarxeta SD");
@@ -525,7 +525,7 @@ namespace Language_gl {
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Expulsar, premer");
 
   LSTR MSG_MIX                            = _UxGT("Mestura");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Compoñente =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Compoñente {");
   LSTR MSG_MIXER                          = _UxGT("Mesturadora");
   LSTR MSG_GRADIENT                       = _UxGT("Degradado");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Degradado Total");

+ 6 - 6
Marlin/src/lcd/language/language_hu.h

@@ -240,7 +240,7 @@ namespace Language_hu {
   LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Viola");
   LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Fehér");
   LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Alapérték");
-  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Csatorna =");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Csatorna {");
   LSTR MSG_LEDS2                          = _UxGT("LED-ek #2");
   LSTR MSG_NEO2_PRESETS                   = _UxGT("Fény #2 megadott");
   LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Fényerö");
@@ -284,10 +284,10 @@ namespace Language_hu {
   LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Áramlásbiztonság");
   LSTR MSG_LASER                          = _UxGT("Lézer");
   LSTR MSG_FAN_SPEED                      = _UxGT("Hütés sebesség");
-  LSTR MSG_FAN_SPEED_N                    = _UxGT("Hütés sebesség =");
-  LSTR MSG_STORED_FAN_N                   = _UxGT("Tárolt hütés =");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Hütés sebesség {");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Tárolt hütés {");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra hütés sebesség");
-  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra hütés sebesség =");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra hütés sebesség {");
   LSTR MSG_CONTROLLER_FAN                 = _UxGT("Hütésvezérlés");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Alapjárat");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Automatikus mód");
@@ -396,7 +396,7 @@ namespace Language_hu {
   LSTR MSG_END_LOOPS                      = _UxGT("Hurok ismétlés vége");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Objektum nyomtatása");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Objektum törlése");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objektum törlése =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objektum törlése {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Kiesés helyreáll.");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Nyomtatás tárolóról");
   LSTR MSG_NO_MEDIA                       = _UxGT("Nincs tároló");
@@ -587,7 +587,7 @@ namespace Language_hu {
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Kidob, kattint");
 
   LSTR MSG_MIX                            = _UxGT("Kever");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Összetevö =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Összetevö {");
   LSTR MSG_MIXER                          = _UxGT("Keverö");
   LSTR MSG_GRADIENT                       = _UxGT("Színátm.");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Teljes színátm.");

+ 4 - 4
Marlin/src/lcd/language/language_it.h

@@ -30,7 +30,7 @@
  * Substitutions are applied for the following characters when used in menu items titles:
  *
  *   $ displays an inserted string
- *   = displays  '0'....'10' for indexes 0 - 10
+ *   { displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
@@ -293,7 +293,7 @@ namespace Language_it {
   LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Viola");
   LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Bianco");
   LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Predefinito");
-  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Canale =");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Canale {");
   LSTR MSG_LEDS2                          = _UxGT("Luci #2");
   LSTR MSG_NEO2_PRESETS                   = _UxGT("Presets luce #2");
   LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Luminosità");
@@ -498,7 +498,7 @@ namespace Language_it {
   LSTR MSG_END_LOOPS                      = _UxGT("Fine cicli di rip.");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Stampa Oggetto");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancella Oggetto");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Canc. Oggetto =");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Canc. Oggetto {");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Ripresa da PowerLoss");
   LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Cont.proc.stampa");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Stampa da media");
@@ -734,7 +734,7 @@ namespace Language_it {
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Rimuovi, click");
 
   LSTR MSG_MIX                            = _UxGT("Miscela");
-  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Componente =");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Componente {");
   LSTR MSG_MIXER                          = _UxGT("Miscelatore");
   LSTR MSG_GRADIENT                       = _UxGT("Gradiente");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Gradiente pieno");

Some files were not shown because too many files changed in this diff