🔨 Fix Multi-Language Menu criteria

MarlinFirmware · May 2, 2023 · 207535a · 207535a
1 parent 4812ed5
commit 207535a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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 : \

diff --git a/Marlin/src/lcd/menu/menu_language.cpp b/Marlin/src/lcd/menu/menu_language.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_MULTI_LANGUAGE
+#if HAS_MENU_MULTI_LANGUAGE
 
 #include "menu_item.h"
 #include "../../MarlinCore.h"
@@ -56,4 +56,4 @@ void menu_language() {
   END_MENU();
 }
 
-#endif // HAS_MULTI_LANGUAGE
+#endif // HAS_MENU_MULTI_LANGUAGE
diff --git a/ini/features.ini b/ini/features.ini
@@ -76,7 +76,7 @@ HAS_MENU_DELTA_CALIBRATE               = src_filter=+<src/lcd/menu/menu_delta_ca
 HAS_MENU_FILAMENT                      = src_filter=+<src/lcd/menu/menu_filament.cpp>
 LCD_INFO_MENU                          = src_filter=+<src/lcd/menu/menu_info.cpp>
 HAS_MENU_JOB_RECOVERY                  = src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
-HAS_MULTI_LANGUAGE                     = src_filter=+<src/lcd/menu/menu_language.cpp> +<src/gcode/lcd/M414.cpp>
+HAS_MENU_MULTI_LANGUAGE                = src_filter=+<src/lcd/menu/menu_language.cpp>
 HAS_MENU_LED                           = src_filter=+<src/lcd/menu/menu_led.cpp>
 HAS_MENU_MEDIA                         = src_filter=+<src/lcd/menu/menu_media.cpp>
 HAS_MENU_MIXER                         = src_filter=+<src/lcd/menu/menu_mixer.cpp>
@@ -225,6 +225,7 @@ HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
 HAS_GCODE_M255                         = src_filter=+<src/gcode/lcd/M255.cpp>
 HAS_LCD_BRIGHTNESS                     = src_filter=+<src/gcode/lcd/M256.cpp>
 HAS_SOUND                              = src_filter=+<src/gcode/lcd/M300.cpp>
+HAS_MULTI_LANGUAGE                     = src_filter=+<src/gcode/lcd/M414.cpp>
 TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>
 ARC_SUPPORT                            = src_filter=+<src/gcode/motion/G2_G3.cpp>
 GCODE_MOTION_MODES                     = src_filter=+<src/gcode/motion/G80.cpp>