Skip to content

Commit c2796fb

Browse files
thinkyheadthinkyhead
committed
🌐 Tweak language selection
1 parent 37777a7 commit c2796fb

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

‎Marlin/src/core/multi_language.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ typedef const char Language_Str[];
3636
#define NUM_LANGUAGES 1
3737
#endif
3838

39-
// Setting the unused languages equal to each other allows
40-
// the compiler to optimize away the conditionals
41-
39+
// Set unused languages equal to each other so the
40+
// compiler can optimize away the conditionals.
4241
#ifndef LCD_LANGUAGE_2
4342
#define LCD_LANGUAGE_2 LCD_LANGUAGE
4443
#endif
@@ -58,11 +57,11 @@ typedef const char Language_Str[];
5857
#if NUM_LANGUAGES > 1
5958
#define HAS_MULTI_LANGUAGE 1
6059
#define GET_TEXT(MSG) ( \
61-
ui.language == 0 ? GET_LANG(LCD_LANGUAGE )::MSG : \
62-
ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
63-
ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
60+
ui.language == 4 ? GET_LANG(LCD_LANGUAGE_5)::MSG : \
6461
ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
65-
GET_LANG(LCD_LANGUAGE_5)::MSG )
62+
ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
63+
ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
64+
GET_LANG(LCD_LANGUAGE )::MSG )
6665
#define MAX_LANG_CHARSIZE _MAX(GET_LANG(LCD_LANGUAGE )::CHARSIZE, \
6766
GET_LANG(LCD_LANGUAGE_2)::CHARSIZE, \
6867
GET_LANG(LCD_LANGUAGE_3)::CHARSIZE, \

‎Marlin/src/lcd/language/language_en.h‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
#endif
4242
#undef en
4343

44+
#define MEDIA_TYPE_EN "Media"
45+
4446
namespace Language_en {
4547
constexpr uint8_t CHARSIZE = 2;
4648
PROGMEM Language_Str LANGUAGE = _UxGT("English");
@@ -51,11 +53,11 @@ namespace Language_en {
5153
PROGMEM Language_Str MSG_NO = _UxGT("NO");
5254
PROGMEM Language_Str MSG_BACK = _UxGT("Back");
5355
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Aborting...");
54-
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Media Inserted");
55-
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Media Removed");
56-
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Waiting for media");
56+
PROGMEM Language_Str MSG_MEDIA_INSERTED = MEDIA_TYPE_EN _UxGT(" Inserted");
57+
PROGMEM Language_Str MSG_MEDIA_REMOVED = MEDIA_TYPE_EN _UxGT(" Removed");
58+
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Waiting for card");
5759
PROGMEM Language_Str MSG_SD_INIT_FAIL = _UxGT("SD Init Fail");
58-
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Media read error");
60+
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = MEDIA_TYPE_EN _UxGT(" read error");
5961
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB device removed");
6062
PROGMEM Language_Str MSG_MEDIA_USB_FAILED = _UxGT("USB start failed");
6163
PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW = _UxGT("Subcall Overflow");
@@ -399,7 +401,7 @@ namespace Language_en {
399401
PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("EEPROM Index Error");
400402
PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("EEPROM Version Error");
401403
PROGMEM Language_Str MSG_SETTINGS_STORED = _UxGT("Settings Stored");
402-
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Media Update");
404+
PROGMEM Language_Str MSG_MEDIA_UPDATE = MEDIA_TYPE_EN _UxGT(" Update");
403405
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reset Printer");
404406
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Refresh");
405407
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info Screen");
@@ -431,8 +433,8 @@ namespace Language_en {
431433
PROGMEM Language_Str MSG_CANCEL_OBJECT = _UxGT("Cancel Object");
432434
PROGMEM Language_Str MSG_CANCEL_OBJECT_N = _UxGT("Cancel Object =");
433435
PROGMEM Language_Str MSG_OUTAGE_RECOVERY = _UxGT("Power Outage");
434-
PROGMEM Language_Str MSG_MEDIA_MENU = _UxGT("Print from Media");
435-
PROGMEM Language_Str MSG_NO_MEDIA = _UxGT("No Media");
436+
PROGMEM Language_Str MSG_MEDIA_MENU = _UxGT("Print from ") MEDIA_TYPE_EN;
437+
PROGMEM Language_Str MSG_NO_MEDIA = _UxGT("No ") MEDIA_TYPE_EN;
436438
PROGMEM Language_Str MSG_DWELL = _UxGT("Sleep...");
437439
PROGMEM Language_Str MSG_USERWAIT = _UxGT("Click to Resume...");
438440
PROGMEM Language_Str MSG_PRINT_PAUSED = _UxGT("Print Paused");
@@ -475,9 +477,9 @@ namespace Language_en {
475477
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Unload Filament");
476478
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Unload *");
477479
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Unload All");
478-
PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Attach Media");
479-
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Change Media");
480-
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Release Media");
480+
PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Attach ") MEDIA_TYPE_EN;
481+
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Change ") MEDIA_TYPE_EN;
482+
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Release ") MEDIA_TYPE_EN;
481483
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed");
482484
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("Skew Factor");
483485
PROGMEM Language_Str MSG_BLTOUCH = _UxGT("BLTouch");

0 commit comments

Comments
 (0)