Merge upstream changes from Marlin 2.1.2.2

2024-02-13 20:32:22 +01:00
parent e466309bfb
commit 752476dc8f
1367 changed files with 41601 additions and 31124 deletions
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -64,6 +64,9 @@ typedef const char Language_Str[];

 #if NUM_LANGUAGES > 1
  #define HAS_MULTI_LANGUAGE 1
+  #if HAS_MARLINUI_MENU
+    #define HAS_MENU_MULTI_LANGUAGE 1
+  #endif
  #define GET_TEXT(MSG) ( \
    ui.language == 4 ? GET_LANG(LCD_LANGUAGE_5)::MSG : \
    ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \