Skip to content

Commit 207535a

Browse files
committed
🔨 Fix Multi-Language Menu criteria
1 parent 4812ed5 commit 207535a

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Marlin/src/core/multi_language.h

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ typedef const char Language_Str[];
6464

6565
#if NUM_LANGUAGES > 1
6666
#define HAS_MULTI_LANGUAGE 1
67+
#if HAS_MARLINUI_MENU
68+
#define HAS_MENU_MULTI_LANGUAGE 1
69+
#endif
6770
#define GET_TEXT(MSG) ( \
6871
ui.language == 4 ? GET_LANG(LCD_LANGUAGE_5)::MSG : \
6972
ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \

Marlin/src/lcd/menu/menu_language.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "../../inc/MarlinConfig.h"
2828

29-
#if HAS_MULTI_LANGUAGE
29+
#if HAS_MENU_MULTI_LANGUAGE
3030

3131
#include "menu_item.h"
3232
#include "../../MarlinCore.h"
@@ -56,4 +56,4 @@ void menu_language() {
5656
END_MENU();
5757
}
5858

59-
#endif // HAS_MULTI_LANGUAGE
59+
#endif // HAS_MENU_MULTI_LANGUAGE

ini/features.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ HAS_MENU_DELTA_CALIBRATE = src_filter=+<src/lcd/menu/menu_delta_ca
7676
HAS_MENU_FILAMENT = src_filter=+<src/lcd/menu/menu_filament.cpp>
7777
LCD_INFO_MENU = src_filter=+<src/lcd/menu/menu_info.cpp>
7878
HAS_MENU_JOB_RECOVERY = src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
79-
HAS_MULTI_LANGUAGE = src_filter=+<src/lcd/menu/menu_language.cpp> +<src/gcode/lcd/M414.cpp>
79+
HAS_MENU_MULTI_LANGUAGE = src_filter=+<src/lcd/menu/menu_language.cpp>
8080
HAS_MENU_LED = src_filter=+<src/lcd/menu/menu_led.cpp>
8181
HAS_MENU_MEDIA = src_filter=+<src/lcd/menu/menu_media.cpp>
8282
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>
225225
HAS_GCODE_M255 = src_filter=+<src/gcode/lcd/M255.cpp>
226226
HAS_LCD_BRIGHTNESS = src_filter=+<src/gcode/lcd/M256.cpp>
227227
HAS_SOUND = src_filter=+<src/gcode/lcd/M300.cpp>
228+
HAS_MULTI_LANGUAGE = src_filter=+<src/gcode/lcd/M414.cpp>
228229
TOUCH_SCREEN_CALIBRATION = src_filter=+<src/gcode/lcd/M995.cpp>
229230
ARC_SUPPORT = src_filter=+<src/gcode/motion/G2_G3.cpp>
230231
GCODE_MOTION_MODES = src_filter=+<src/gcode/motion/G80.cpp>

0 commit comments

Comments
 (0)